Merge branch 'feature/measureOwnTab'