Merge commit '59d4a5369cd68d4b65809ded407611b62b013f9a' * commit '59d4a5369cd68d4b65809ded407611b62b013f9a': Do not deference before null check
Merge commit '59d4a5369cd68d4b65809ded407611b62b013f9a' * commit '59d4a5369cd68d4b65809ded407611b62b013f9a': Do not deference before null check