Merge from AWS
Bug fix

Trigger functions added to R and solved Mubsub reference bug