Merge "Forward compatibility patch."