fix #2607: avoid error in log during list loading
Merge remote-tracking branch 'origin/release'