Merge pull request #442 from xschildw/change-msgs

Change msgs
simlified
Merge pull request #446 from john-hill/rebroadcast

simlified
Merge branch 'release-v' into develop