update version to 5.0-M4-S6
Merge branch 'fix-destroy' into n2
Merge branch 'update-river' into n2