[us-commits] [ehb54/ultrascan3] 8b4d2d: Consolidated commit after cleanup