Issue #2219581 by Xano: Implement #2155635.