acu76714 - real fix for infinite retries
Merge branch 'purpleDJR_13_2_acu76714_fix_infinite_retries' into release4.7