Finally, proper EDR support (NCC, VI4BO, etc...) [978]