Merge changes I46ea9aa5,I6c3c8841 into main

* changes:
  Rename ShapeGridInteractor and ShapeGridRepository
  Shape options