Progress step now supports Retry
Other minor fixes