merging 1.6.x to master branch