Merge request - Updated 2 upstream sources
Merge request - Updated US source to: 7eaf87b Update manifests to match v1.6.1 KF manifests