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