Merge "fix missing context handling"