Merge with trunk: Statement.Save did not work at all