Merge pull request #1 from intalio/K2

K2
Fix for WF-1631
Merge pull request #3 from jassal/K2

K2