Merge "[SO] Bump SO nssmf adapter version" into istanbul