WOBS-3177: Adds missing code to core for this feature
Merge pull request #643 from m038/WOBS-3177-tw-temp

WOBS-3177: Adds missing code to core for this feature