am e83a81e1: Merge "BasicContactables: Fix lines >100 cols" into jb-mr2-dev

* commit 'e83a81e160331583c4235f8129f7c781f87bd704':
  BasicContactables: Fix lines >100 cols