AI-773 : we don't need ugly hack with commit() anymore