5.2.1 commit

Submitted changes by Katie as 5.2.1.