Updated.
To be able to run just the fallback.
Merge branch 'only_serve_fallback' into develop
Updated changes.