Merge branches 'idx/verh' and 'idx/qmqpc'