merged conversion changes from staging