Move nqq changes in nqq branch