PLATFORM-493

Making additional tweaks after feedback from VSTF