Refactor code all mono versions
Merge branch 'CL-2907621492889'