Merge branch 'jc/maint-status-preload' into maint