Merge "C2BqPool: Handle generation # retrieval failure" into qt-dev