first commit on bug_fix_123 branch
second commit on bug_fix_123 branch