Merge branch 'yd/hardcoded' into maint