U4-4575 - refactor