Implementing the "undecorated parent" migration described in https://hackmd.io/sfb3Ju2MTmKHSUiX_dLWGg#Design PR Close #31544