Integrating frommaster to dev as a part of release-0.8.12