Merge branch 'fix/bug' into dev

Conflicts:
AndroidManifest.xml