Merge branch 'tests/apc2s-update_outbox' into 'develop'