Fix 2 Router-related errors
Merge branch 'develop' into feature/output_compressed_cache