Update 1.8.* branch to fix problem with FILTERFILEURL

As discussed in issue #1565