Merge "Add config option to enable/disable alarm creation during testing"