[Observe-commits] 02/02: Fixes #7819 Merge branch 'feature/7819' into develop-4.x