story: 46308013 reg mapper fixes