Merge "[optimizing] Fix a bug in moving the null check to the user."