[PSM-1082]