Merge toq Coq from Åsa