Merge branch 'bugfix/mrf-reject-logging' into 'develop'