Security fix and upgrade of the grid editor

Change-Id: Ia19f1ae986e802688715413c9908729400279078