[PSM-1081]