Feature/owd 32505 refactor messages