Merge "Add feature context"