Merge changes I6cf71af4,I73b49b75 into main

* changes:
  Fix e2e tests.
  Lint fixes.