ref #4178 - change system message state
Merge remote-tracking branch 'origin/master'