Merge tag 'v3.0.100' into HEAD