merging from AAROC/dev