Merge after reverting the python scripts to generating hex file with UICR