ADEN-1407 fix mercury