updated with feedback from cordova crew