Merge branch 'misc2' into devel