feature4 init
merge feature4