Merge "Drop OfficialClientManager and references to it"