[Gitflow] Merge master into develop #12464
+199
−166
We went looking everywhere, but couldn’t find those commits.
Sometimes commits can disappear after a force-push. Head back to the latest changes here.