Merge "Update context-instance xpath format according to latest changes in config...