Merge "Put known answers to query packets" into main