Fix possible bug on android < 11
Merge branch 'master' into develop
Refractoring
More refracotoring
Updating gitignore
Refractoring