Fix for save templatetag: Only manipulating the uppermost context
Released v1.36.1