Merge branch 'hardcoded' into dynamic