Fix for 7403 - a race condition bug.#7404

swojtasiak wants to merge 1 commit intogo-gorm:mastergo-gorm/gorm:masterfrom

swojtasiak:bugfix_race_conditionswojtasiak/gorm:bugfix_race_conditionCopy head branch name to clipboard