Merge branch 'misc-patches' into devel