Merge from mentor/atp

Both updated upstream danny commits and the mentor/atp cherry picks.