.......... [RSM-1] 109: merge from RSM-1-114