Merge "DO NOT MERGE BQ: fix some uninitialized variables" into klp-dev