Fix for LHCBPS-1822
Cherry-pick of MR !493 (merged) to the master branch.
(cherry picked from commit f28c4324)
5870cff2 Fix for LHCBPS-1822
Edited by Eduardo Rodrigues
Cherry-pick of MR !493 (merged) to the master branch.
(cherry picked from commit f28c4324)
5870cff2 Fix for LHCBPS-1822