MIL-253 blog references
merge conflicts fixed