Merge "Updated dimensions to align with mocks" into main