..F....... [RSM-1] reverted changes from removed dev branch