Merge "Update existing ECM settings to use new infrastructure" into main