Merge "Implement some methods in 2.1 default implementation"