CON-862 More strange spaces removed