Make changes for 0.14
Merge branch '0.14'