reverting FLEX-34101 as this cause several spark list test to fails and one to RTE
Merge remote-tracking branch 'origin/release4.12.0' into develop