Merged QTL from sandbox branch