Merge branch 'wip/T14951' into wip/T14068