Merge pull request #1702 from cloudedge/master

Merged by devtool for aabes