Merge "Reorder node's children only required case." into devel/master