Local adapations
Merge branch 'Issue_02.141' of https://github.com/jbunzel/MvcRQ_git