Merge "Add security version to config descriptor"