Issue 19453: Rework of workspace to loop through controls vs attributes