am d65825ab: Merge "Private flags are masked in correct variable" into klp-dev

* commit 'd65825ab1cdbfd88122beaaad8cf815434cbf46d':
  Private flags are masked in correct variable