enhance check in clear optional tail
Merge branch '1.x' into 2.x