Dev/0.6 from old que repo

move changes form old que repo into new