Merge branch 'rs/merge-microcleanup' into maint