Merge "Eliminate a cycle in class hierarchy." into nyc-andromeda-dev