Saving new answer in Grid, relates to #1970
Merge remote-tracking branch 'origin/develop' into develop