this is to fix assertion failure due to source merged from QA branch.