Revised fix for ROOT-8452#550

dpiparo merged 2 commits intoroot-project:masterroot-project/root:masterfrom

gganis:jira-root-8452ngganis/root:jira-root-8452nCopy head branch name to clipboard