[1.7.x] Fixed #23315: Operational dependency fail with mixed create/add