XX-10733 Merged community patch (x/ changes)