add behaviors
Merge branch 'sjs/behaviors' into 1.7