fixed generator with gridId
Merge commit '02be631'