Merge "Fix issue where the solution is not updated when the grid is empty" into tm-qpr-dev