Merge aperture fixses from upstream