Merge "Forward-compatibility stubs"