[ALOY-938] Conditional TSS creates unexpected _.extend() calls
Merge pull request #357 from skypanther/ALOY-938

[ALOY-938] Conditional TSS creates unexpected _.extend() calls