Merge "Fix RIDL directory creation" into FPIIM_WIP