qtmir: merge Mir2 and Mir1 branches (upstream)