Merge branch '1912-leading-trailing-space-search' into 'develop'