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