Issue #19304 Fix REST resource id to work with natural key.