6.2.5

Cherry-pick from parent project main branch some open Pull Requests:

Android

• dpa99c#505 suggest edit-config instead of config-file in readme, by @ath0mas