Merge "Infrastructure for obsolete methods"