Merge branch 'mdw+fixes'