MERGE: changes from Princeton commits