Merge "Add 'retries_wait' parameter for enforceState method - Fix usage of non-defiened retries_wait variable" into release/2019.2.0