changes to tern
merged