Merge branch 'gl/4.0/comp' into gl/4.0/core