Call onFinished if the callback returns false
Refactor a else/if
Merge branch 'michel_2555_each' into v1.13.x