Merge remote-tracking branch 'origin' into basop-2206-investigate_accuracy_issues