[fix] [minor] pull updates from 1310 branch
[fix] Rename and merge rewrite
[minor] merge conflict fixed
Merge branch 'master' of github.com:webnotes/wnframework