Merge in HQ version 294