Feature/ev 533 config review cycle