merge avboost fix from QVOD2 internal product