Merge changes from topic "jan7"

* changes:
  Gently ramp up strictness.
  Final push to build against SDK.