[PLAT-2959] - Merge from develop branch