BC-2317 #resolve Bug fixes, and resolved for all custom RequestMappers