Merge "Adding specific buckets for N5 in dynamic grid. (Bug 12604220)" into jb-ub-now-kermit