Merge "Fix pushing null queue update" into tm-dev