AM PR optimisation
Merge pull request #6114 from sviret/TrackFindingAM_SV_301014

AM PR optimisation