WIP: Merge Julius updates

Prepare to merge Julius work in master

Merge request reports

Loading