[*] Changes from the support-9376 branch have been ported starting from commit a40d78f605377b27f260ea14ca4a50db8c4b0f4b.
