[PLAT-6531] Changes from code review, no functional changes