Merge pull request #9831 from ronald-cron-arm/finalize-split-preparation-3

Finalize split preparation-3