Merging feature/ximGrid into develop branch