[PLAT-6834] Eliminated duplication