add alone and active
merge from master