Merge "Remove unnecessary marking of last pos"