Merging with AFRL open version