=pre #15022 fixed comparison problem in persistent channel
Merge remote-tracking branch 'origin/master'