Assertion failure in file line 3659 InnoDB

As per the post title, we’re seeing errors like: “InnoDB: Assertion failure in thread 47872623879936 in file line 3659 InnoDB: Failing assertion: !query->intersection” … which cause a server restart. This bug appears to be reported as:
… and fixed in:

We’re running in RDS ( MySQL engine ), and don’t have the luxury of ( quickly ) migrating to Percona-server. I’ve downloaded the latest tarball of mysql ( mysql-5.7.18.tar.gz ) and done a quick grep … I don’t see evidence of the above patch being applied … so I assume this fix has not been pushed upstream? Other than avoiding using fulltext indexes in innodb tables ( which, according to various reports I’ve read, seems to trigger this crash ), do we have any options?