Avoiding git rm with no param + fixed spaces in path params
Merge branch 'dev' into prod