[PLAT-6603] Updates based on initial review from Vince
[PLAT-6603] Fixed merge conflict