Merged latest changes from FastChatMCAM