fix #2706: exception in list adapter
Merge remote-tracking branch 'origin/release'