first commit on bug_fix_456 branch
manual merge of master and bug_fix_456