Merge branch 'imp_qlogs'