Merge "Runtime resolution changes"