Merge remote-tracking branch 'changes/master'

* changes/master:
  3e4225dd5535b86804297f84199adeab9ea8c1c4