Merge branch 'rs/simple-cleanups' into maint