Merge "[SO] Kohn release image updates"