Merge pull request #2780 from alexanderkyte/seq_point_optimize