Merge "Initial Changes for Dynamic Grid" into jb-ub-gel-agar