add/merge with master, updated version of wms clients 1.3, updated timeout