Merge branch 'development' into feature/v1-clean-logs

# Conflicts: # Cargo.lock # Cargo.toml # src/chat.rs # src/main.rs