---
trivial:
  - Integration tests - Backport PR490