Merge branch 'cleanups' into boards