i007_bug03
complete merge i007_bug03