Fix picture display in MLVA and SCVA
Merge changes with master