#14192. align grid cells acording to their type
Merge branch 'sapns__14192' into master2