Adding patch to fix issue with context variable.
Merge branch develop.