add4
add6

commit c773a7d0c867d9431ef34c9f9049bf52572e4102 after cherry pick and merge