Merge remote-tracking branch 'origin/develop' into develop
Rename method to be more descriptive - 'file names' vs 'possible parts'.