Hand over missing context parameter
Merge remote-tracking branch 'origin/7.0-initOS' into 7.0-initOS-issue-6043
Merge pull request #3 from codingforfun/7.0-initOS-issue-6043

Hand over missing context parameter