Merge "Add stubs for better compatibility"