Merge "Pass the calling package to the role holder" into tm-dev