Hm I thought I changed this...
Disabling extend shouldn't be necessary
Merge branch 'master' into tooltips-and-related-lookups