Merge "Fixing icon label not updated during bulk load" into tm-qpr-dev