added v11 and v11 and merged with changes made starting with v10.