Merge branch '4DA-master'
Merge branch '4DA-master'
group: update on-group-message to use msg-history