Revert "Merge branch 'master' into kai-branch"

This reverts commit 917522cd2cfddf52c6434e5ab0a44d254a961df4, reversing
changes made to ade4e806588e82ddfd17da8941ff15384d7f18f5.
Revert "Revert "Merge branch 'master' into kai-branch""

This reverts commit 6462ca5547ff06b0d76c8321de24ea82ae122055.
Revert "Revert "Revert "Merge branch 'master' into kai-branch"""

This reverts commit 6be531a787d9ef40e6d94966bfea9c8ba8daa57d.