[1.7.x] Fixed #23091: CreateModel and AddField were clashing with deferred SQL