Create tab loop

Merged upstream/master, resolved conflicts