Latest image optimisations from upstream repo