Patches for nextdev branch