Merge from create teacher