Tested up to 3.5.1. (Been running on FSD at 3.5.1 for a while now.)
Merge branch 'master' into develop