[us-commits] [ehb54/ultrascan3] d19407: merge master into ehb54-issue-553, conflicts manua...