consistent scope forwarding, support for observable association ids
Merge branch 'develop'