Merge "BUG-731: remove unneeded null check"