edit 8.0.4 version history item #3984
edit 8.0.4 version history item #3957
Merge branch 'V8_0-branch' into V8_1_2-branch