applied patch to fix blaze template context issue.