Merge "fix ODL image bug"