Merge branch 'gl/cleanup'