Sorry, removing previous commits to master branch and synchronize it with current v1.4.x.