Merge "Fix for Iaac1bb9a (6b2b06d): remove leading space"