Initial preparation for next APK version