Merge "Hiding deprecated classes and methods"