Fix compability with clean_data.
Merge branch 'master' into feature/server_router