Merge "Fix punch hole wrong position during rotation" into tm-dev