Merge branch 'rmobile/kota2' into rmobile-latest