Re #10708 Better handling properties from workspace