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