Fix a crash if no selector could be found
3.5.4 release and documentation updates
Merge branch 'release/3.5.4' into develop