Merge dev - enable breaking in the middle of line