adding tolerated line diagnostics
Merge branch 'dev'