Merge "Updated Javadoc to reflect min period"