Security fix and upgrade of the grid editor

Change-Id: I9f3a05b45dd55672a5e454e57836acbd68264e35