fix issue #360169
Merge branch 'fix/iss360169' into develop
fix issue #360175
Merge branch 'fix/iss360175' into develop
Merge pull request #7 from efpato/develop

Develop