Merge "Context: Fix nullability issues"