See merge request !1324 (merged)
(cherry picked from commit 0956aa96)
See LHCBPS-1836
See merge request !1324 (cherry picked from commit 0956aa96)