Merge "Log CONFIG_AT_END flag in the Change" into main