Merge "Fix possible error if negative grid columns set" into devel/master