Fixes work items 24072 and 24044