Merge branch 'fix/docs-tabs' into 'develop'