Merge "Fix run.sh bug for dynamic interfaces"