Issue #2320139 by Xano: Implement #2305839.
Removed debugging code.