cproj changes
020.18 Alignment changes - canonical_machine, controller, config, config_app, main
alignment commit