Issue/pup 1712/trusty acceptance