Merge "Cap pts gap between adjacent frames to specified value" into klp-dev