merged conversion changes from staging
optimized images