[Observe-commits] 04/04: Fixes #8538 Merge branch 'feature/8538' into develop