ASGARD-1073 - Minor changes from platform team feedback.