Merge "Forward compatibility fixes"