INFRA-583 spacing fixes