Merge changes from topic "lazy-cas"

* changes:
  Fix typo in comment
  Add default argument to registerServiceWithCallback