Merge from HEAD fixes issues with reporting on an alias, or reporting on multiple modules. PR: 21373 PR: 22877