Merge "Unhide scan methods and classes."