Revert "Revert "Merge pull request #830 from ochameau/tabs-pb""

This reverts commit ddf9d7ef04edf4e5eeb0adab680027a8f67c18ed.