Merge branch 'rs/maint-config-use-labs'