TNO Intern
Merge remote-tracking branch 'origin/75-update-after-java-refactors' into 77-use-dotenv-instead-of-global-path-variables