Merge "Retain default behavior of startODL.sh script" into guilin