Merge branch '98-minor-fix-on-pisces-vertically-integrated-diagnostics' into 'main' See merge request !155