The cherry-pick of bursche-upc-jpsi20G branch to Sim10 is: MR(1016). However, some of the decfiles fail because they need new functionality to be ported to Sim10 Gauss. To proceed with LHCBGAUSS-2613, we now split the origin MR and merge those which are ready to be merged first.