Merge "Forward compatibility fix"