Fix DECRQM behavior
Fix wrong DEQRPM for SRM
Merge branch 'develop'