Added a patch for commit 277228ae9e329c757746d4c74365db4b66c6b998 that was a custom fix for templating issues.  #2618