Merge branch 'button-cleanup' into release