Merge "Remove unused context parameter"