Merge branch 'gl/cleanup' into gl/cleanup-next