merge branch quda-eigcg