Merge branch 'release/3.0.7' into develop
JARVIS-338 Refactoring
Version bump 3.1
Merge branch 'release/3.1'