Merge after - #2397 --------- Co-authored-by: Łukasz Czajka <62751+lukaszcz@users.noreply.github.com>