Merge "Move smart chips (if any) before capture more" into tm-dev