Identify tabs by key instead of ID
Merge branch 'tabKey'