Rolling in additional changes to local assembly and short indel sections.