[Observe-commits] 41/41: Fixes #7739 \o/ Merge branch 'feature/7739' into develop