merged with 2.17 branch
Merge remote-tracking branch 'origin/master'