Merge "Add context for checkin directory"