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

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