merge 2.0.6 grid edit fix