Merge branch 'bjorn-cleanups' into release