Issue #2224551 by Xano: Implement #1316692.