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