Fix Issue 12556 - Add persistent byLine