Merge branch 'hvc_iseries'