Merge changes for informix