Updates from central master into nalanda rct3