CHG: Compat to YAG 3.0_