an original stager fix was lost somehow with another commit
Merge pull request #1725 from remenska/rel-v6r9-fixes

[v6r9] An original stager fix was lost with another stager PR