Merge "Add default implementation for several methods"