sonic: update to new API
svq1: resolve conflict, update to new API