Merge "Added missing framework-location compat config" into main