Merge "Fix content description for the grid option (2/2)" into main