Merge "Add protected context support"