Merge branch 'guruhegde-move-nonnull'