Merge branch 'gl/cleanup-next'