Merge "Improving comment inside expandWithQs for special split shade case" into tm-dev