Fixes #170
Merge branch 'master' into t170_bag_access_urls