WL-2627 comment and empty tabs removed
Merge remote-tracking branch 'origin/WL-2627' into WL-2627