tab builder fix
Merge remote-tracking branch 'origin/master' into 28_Cleanup_showcase_pages