merging from AAROC/master

with boundary role.