CON-620 Spacing changes