Added support for command retries: both in classic & in clustered execution