Automerge:  fix_2
Merge branch 'fix_1' of https://github.com/nata332/CReview into fix_1
Automerge: change in fix_1 for conflict