[Gitflow] Merge master into develop #7922
+161
−123
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.