[Eugene-commits] 03/03: Fixes #3930 Merge branch 'feature/3930' into develop