[#47446443] Avoid infinite until loop
[#47446443] Tweak another dodgy until
[#47446443] Add warning if picking ont inapropriate plate type
Merge pull request #779 from JamesGlover/47446443_memory_issues_with_cherrypicking

47446443 memory issues with cherrypicking