Branch: BUG-3954_sometimes-throw-when-cant-create-item#591ff0f