Looks good on the Dev with your test and with mine. When using the same test case on the Main it creates the repeating attack, as predicted/expected. Hopefully, once the changes are pushed to the Main this will be the last of this. Fingers crossed.
