Merge "ignore odltools errors and continue"