Merge changes I89f65af3,Ic89a85b2 into main

* changes:
  Make linter happier
  Add thread checks