Nalanda rct3 into central-master

Hold off on merging until #2683 has been merged.