Nalanda rct1 merge

Pull code from ka-lite nalanda-rct1