JARVIS-495 version 3.4

This pull request will gather all changes for 3.4

SHOULD NOT BE MERGED!