[PLAT-5472] fixed cherrypick