Tweaks for offline necessity.
Merge branch 'step2'

* step2:
  Tweaks for offline necessity.