Merge remote-tracking branch 'origin/feature/9209_can_file_diffraction'