INFRA-640 Misc