3616 rebase

Rebase for #3616