Merge "Add full child upgrade trigger"