I'm in review of v3 , as it involves aerc update I'll push it to go-team branch first.

Thanks,

Oleg