[MERGE]: merge with email-framwork-addons