U3-3314 - refactor 4895b5a