Nalanda-rct3 -> central-master

@aronasorman maybe add a TODO or `logging.warn` here?