Feature/46297449 state list support