Merge branch 'cleanup' into release