Revert "Merge branch 'master' into develop"

This reverts commit be876e9d00ce59c3b13871c98e457bc2f4e1cd2b, reversing
changes made to edafc233104ceda0c846be7de334e2b8ea2bf0be.
Revert "Revert "Merge branch 'master' into develop""

This reverts commit 4bf3e34e768303a4a3ada42320c05fb300f56056.
Revert "Revert "Revert "Merge branch 'master' into develop"""

This reverts commit f3349ca414a464d5c218cf8069886ef86f8d4750.