Support sibling reordering

Change-Id: Ia3f8390c7597707144edf89920ef26f9b69e78a7