Follow LHCb!3806
Changes to be in line with LHCb!3806 (merged)
To be tested with: Moore!1812 (merged), LHCb!3806 (merged) and DaVinci!731 (merged)
Edited by Abhijit Mathad
Changes to be in line with LHCb!3806 (merged)
To be tested with: Moore!1812 (merged), LHCb!3806 (merged) and DaVinci!731 (merged)