Issue #2284909 by Xano: Implement #2282453.