Merge branch 'development' into feature/xcrs-androidkit

# Conflicts: # crates/xcrs/src/mcp.rs