updated to support mike's new autorelation feature
Merge branch 'feature/autorelations' into release/orbis-r2