version history for #4197 and #4110
Merge branch 'V8_1_4-branch'