Merge "Bug 6931 - Fix unsupported specific type of leaf"