[PLAT-6658] Response to pull request review