DO NOT MERGE - FOR INTERNAL CODE REVIEW ONLY

Moved into parent classes.