Sending trigger and transactional messages implemented
Merge with master