manually merge with master
Merge remote-tracking branch 'origin/FilterFilmmakers'