Merge branch 'shipping-emission' into 'cams_50'

updated vertical shipping emissions

See merge request !94