[draft] ZSA assets swap

[draft] ZSA assets swap #1813