align to SmallPitch_on612 branch from Eric