Merge "deviceContext changes"