CORE-4775 fix space issue
Merge branch 'master' into STABLE