Feature/ev 544 add config opt