Merge remote-tracking branch 'origin/bugfix/8443_many_singletons'
Merge remote-tracking branch 'origin/feature/8372_to_lam'
Refs #8344 Update reference results.

Also swap the test names so they refer to the correct instrument data being tested.
Merge branch 'bugfix/8344_automatically_transpose_data_in_diagnostics' into develop