Extension dev

Routine merge from ext branch