Merged eb/usrp-la r6317:6320 into trunk. This deborks the dependency