[Pom-commits] 03/04: Fixes #3886 Merge branch 'feature/3886' into develop