[us-commits] [ehb54/ultrascan3] 03328e: *beta* addt'l deprecation fixes