Merge "Add 'retries_wait' parameter for enforceState method"