Updates to merge in latest nalanda-rct3 to central.