Fixed error in development branch when legend was disabled.
Merge remote-tracking branch 'origin/rambera' into rambera