(cherry picked from commit 9b2bb85c

)

Co-authored-by: Roman <roman@osmosis.team>