Merge HQ version 240