Merge "Add flags to context creation for RS"