Further fixes for legacy products
Merge branch 'master' into SwiftTest