merge Release 0.12.0 to nalanda-rct2