Merging dev-misc to dev.