Issue #2234795 by Xano: Implement #1512424.