Request to merge into core68