Fix/intercom

Added fix for 'plan and monthly_spend only supported as traits' ticket.

@amillet89 @yields