Revert "Revert "Merge remote-tracking branch 'origin/master' into pre_release""

This reverts commit e220b40bf971384eea0a36ef8d6358da5ed9f131.