Take updates for changes made for Dasein team

includes some updates from Dasein team also (had to take updates to make merge automagic for our push to them)