13dd962
ticket #47550 wip (cherry picked from commit 82377636267787be5182457d619d5a0b662d2658) (cherry picked from commit 181fde98aee96868189bc5557c5f33fefa026952)