Merge "Add versionCode"