RMT-186 & other changes

RMT-186 & other changes