Resolve "Fix bugs found by testing pre-release 2024.07.5" Closes #323 See merge request grp-fidentis/analyst2!349