Issue 19453: Refactored workspace to send an object for the attribute for certain values