snap 3.5+5 with daemon fixes merged from anthony