CON-1130 | changes after CR, mostly spaces