fix #2674: Disable trail on map does not refresh
Merge remote-tracking branch 'origin/release'