am 9163b1d9: am 23ae1461: Merge "Add flags word to initialization." into klp-dev

* commit '9163b1d9ceeca3e956218dda1ca19a748dc48d8d':
  Add flags word to initialization.