Cherry picked commits pulled from baruch/nRF24LE1_Programmer