Merge branch 'features/JAL-857_dynamic-example-files' into develop