Merge "Add stubs for improved compatibility"