[Jmexico-commits] 03/03: fixes #7192: Migrates to git Merge branch 'feature/7192' into develop