temp fix for irc issue
Merge branch 'r4.8.2'