Automerge:  fix_2
Merge branch 'fix_1' into patch_auto