fixed work1 in rsr
Merge branch 'modev'