fix conversion issue
Merge branch 'dev' into public-cloud