[us-commits] [ehb54/ultrascan3] bcde83: updates present in master merged to somo-dev