Merge "Increase char limit on tab setting" into jb-dev