tuna: bring up 4.3 changes