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