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

* commit '23ae1461d2cf0ac3f1da71200544381a8d8a4957':
  Add flags word to initialization.