We need to test and merge #6393, and release v6.0.0 before August 31st to comply with the play store policies.