am d599b393: Merge "Checker cleanup"

* commit 'd599b39357cb0d3ab8b719357c86ffe609bb3fcb':
  Checker cleanup