CHG: Compatibility to YAG 3.0 (WIP)
CHG: YAG 3.0 Compatibility
TASK: Merge