Merge dev-7-refactor-tabs