merging from AAROC/master

Many changes and site variables separated.