Add changes from master into `Mobile-Fixes`