Also, fixed a bug where the tags were being merged into the wrong data structure (passed_vars) in _build_role_dependencies() Fixes #6439 Fixes #5709