Merge branch 'sp/misccleanup'