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