merge 17.1.A.1.36 firmware sources