Merge branch 'chore/jason-in-tests' into 'develop'