merge conflict resolved
changes in grid scrolling for expandable rows
resolving merge conflicts
changes in expandable functionality