ticket #47550 wip
(cherry picked from commit 82377636267787be5182457d619d5a0b662d2658)
(cherry picked from commit 181fde98aee96868189bc5557c5f33fefa026952)
(cherry picked from commit 13dd9625b01d820526d7187e524669ee83edfe62)
(cherry picked from commit 038b12a62f60a50cf0aaea9d5d912bbce6237faa)