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