More work on AXIS-2882.
6 files changed