Merge with e17-misc devel