widened line location table
Merge branch 'develop' into testing