Merge "Improve javadoc description for recoverAndDeleteData()"