Bug Hunting for Version 8.5.3 Compatibility
Merge branch 'dev/iteration2' into dev/it2/cgu