update mercury version
Merge remote-tracking branch 'origin/master'
add later om test