merge from dev for behaviorlib
finishing merge