Not fail on updating parent links Upstream-commit: 84f25414c18f726bccac10710f5971f5c5d822cd Component: engine