Issue #2219585 by Xano: Implement #2155635.