015.05 Code alignment in canonical machine and config