Merge "Revert "Add support for send Message with messaging options""