APOLLO-3179 Updated as per comments on PR