INFRA-540: tweaks for 7.0 content