Merge branch 'mr_124_squashed' into maint-0.3.5