Q3 (emil) merge