fix #2591: crash in logging activity
Merge remote-tracking branch 'origin/release'