Reg mapper and sanitization fixes [story:43275097]