Fixed the white-space characters #kentprojects-38
Merge remote-tracking branch 'origin/develop' into develop