Ndkr10 w/ 4.9

I branched off of master before merging your ndkr10 in, so a couple newer changes from there as well.