Fixes work item 23981