Sync with commit 5ed68d8 (introduces tabs)