Remove unneeded import
WAI version bumps
Merge remote-tracking branch 'origin/postgres' into postgres