Merge "Remove unused context variable" into sc-dev