QCIds update
Revert "QCIds update"

This reverts commit 53caca47cbd171047ba848996667caaa19ae2441.
QCIds update
Merge origin/master