Merge "Switch previous and new code path in setChildChain"