U4-4575 - refactor prop. conversion logic