Merge branch 'cc/ref-is-hidden-microcleanup' into maint