Merge "Re-enabled Acorn transaction cancellation support for testing"