Merge and squash of code for Kuali version.