CORE-4775 fix space issue
CORE-4876