Merge JSON breakpoints functionality in preparation for 0.3.0