[PSM-10845]