Merge "Remove AltManager class from client"