Issue #2381641 by Xano: Replace drupal_render() calls