Merge branch 'js/configurable-tab'