Issue #2824267 by quietone, shashikant_chauhan, faline, mikeryan, OnkelTem, ohthehugemanatee: Highwater condition isn't added (on remote databases)