diff --git a/CRM/Contact/BAO/Query.php b/CRM/Contact/BAO/Query.php
index 4a108032a0c5..648fd5d95738 100644
--- a/CRM/Contact/BAO/Query.php
+++ b/CRM/Contact/BAO/Query.php
@@ -612,7 +612,7 @@ public function initialize($apiEntity = NULL) {
    *
    * this code is primarily for search builder use case where different clauses can specify if they want deleted.
    *
-   * CRM-11971
+   * @see https://issues.civicrm.org/jira/browse/CRM-11971
    */
   public function buildParamsLookup() {
     $trashParamExists = FALSE;
@@ -4789,7 +4789,7 @@ public static function isAlreadyProcessedForQueryFormat($values) {
    * Country is implicit from the state, but including both results in
    * a poor query as there is no combined index on state AND country.
    *
-   * CRM-18125
+   * @see https://issues.civicrm.org/jira/browse/CRM-18125
    *
    * @param array $formValues
    */
diff --git a/CRM/Contact/Form/Task.php b/CRM/Contact/Form/Task.php
index 7a7d57093f11..2f7695dc7db1 100644
--- a/CRM/Contact/Form/Task.php
+++ b/CRM/Contact/Form/Task.php
@@ -334,7 +334,7 @@ public function addDefaultButtons($title, $nextType = 'next', $backType = 'back'
   /**
    * Replace ids of household members in $this->_contactIds with the id of their household.
    *
-   * CRM-8338
+   * @see https://issues.civicrm.org/jira/browse/CRM-8338
    */
   public function mergeContactIdsByHousehold() {
     if (empty($this->_contactIds)) {
diff --git a/CRM/Contact/Import/Parser/Contact.php b/CRM/Contact/Import/Parser/Contact.php
index 760d16059b8d..dc3441baaad2 100644
--- a/CRM/Contact/Import/Parser/Contact.php
+++ b/CRM/Contact/Import/Parser/Contact.php
@@ -1955,7 +1955,7 @@ public static function getSubtypes($contactType) {
    * 1) the chosen dedupe rule falling back to
    * 2) a check for the external ID.
    *
-   * CRM-17275
+   * @see https://issues.civicrm.org/jira/browse/CRM-17275
    *
    * @param array $params
    *
diff --git a/CRM/Contribute/BAO/Contribution.php b/CRM/Contribute/BAO/Contribution.php
index 97632dc2a3d4..a25897313876 100644
--- a/CRM/Contribute/BAO/Contribution.php
+++ b/CRM/Contribute/BAO/Contribution.php
@@ -3939,7 +3939,7 @@ public static function checkStatusValidation($values, &$fields, &$errors) {
   /**
    * Delete contribution of contact.
    *
-   * CRM-12155
+   * @see https://issues.civicrm.org/jira/browse/CRM-12155
    *
    * @param int $contactId
    *   Contact id.
@@ -4004,7 +4004,7 @@ public static function buildOptions($fieldName, $context = NULL, $props = []) {
   /**
    * Validate financial type.
    *
-   * CRM-13231
+   * @see https://issues.civicrm.org/jira/browse/CRM-13231
    *
    * @param int $financialTypeId
    *   Financial Type id.
diff --git a/CRM/Contribute/BAO/Contribution/Utils.php b/CRM/Contribute/BAO/Contribution/Utils.php
index 8bbb2c51e10e..21fd4716d431 100644
--- a/CRM/Contribute/BAO/Contribution/Utils.php
+++ b/CRM/Contribute/BAO/Contribution/Utils.php
@@ -485,7 +485,7 @@ public static function calculateTaxAmount($amount, $taxRate) {
 
   /**
    * Format monetary amount: round and return to desired decimal place
-   * CRM-20145
+   * @see https://issues.civicrm.org/jira/browse/CRM-20145
    *
    * @param float $amount
    *   Monetary amount
diff --git a/CRM/Contribute/Form/Contribution.php b/CRM/Contribute/Form/Contribution.php
index b063ed269d3c..09f05ba0bd49 100644
--- a/CRM/Contribute/Form/Contribution.php
+++ b/CRM/Contribute/Form/Contribution.php
@@ -1737,7 +1737,7 @@ protected function invoicingPostProcessHook($submittedValues, $action, $lineItem
   /**
    * Calculate non deductible amount.
    *
-   * CRM-11956
+   * @see https://issues.civicrm.org/jira/browse/CRM-11956
    * if non_deductible_amount exists i.e. Additional Details field set was opened [and staff typed something] -
    * if non_deductible_amount does NOT exist - then calculate it depending on:
    * $financialType->is_deductible and whether there is a product (premium).
diff --git a/CRM/Contribute/Form/Contribution/Confirm.php b/CRM/Contribute/Form/Contribution/Confirm.php
index f478e80e708e..a1da2697a622 100644
--- a/CRM/Contribute/Form/Contribution/Confirm.php
+++ b/CRM/Contribute/Form/Contribution/Confirm.php
@@ -201,7 +201,7 @@ public static function getContributionParams(
    *
    * This is a bit too much about wierd form interpretation to be this deep.
    *
-   * CRM-11885
+   * @see https://issues.civicrm.org/jira/browse/CRM-11885
    *  if non_deductible_amount exists i.e. Additional Details fieldset was opened [and staff typed something] -> keep
    * it.
    *
diff --git a/CRM/Core/BAO/Block.php b/CRM/Core/BAO/Block.php
index 1da672573030..0689b0a495bd 100644
--- a/CRM/Core/BAO/Block.php
+++ b/CRM/Core/BAO/Block.php
@@ -439,7 +439,7 @@ public static function handlePrimary(&$params, $class) {
       /*
        * If the only existing email is the one we are editing then we must set
        * is_primary to 1
-       * CRM-10451
+       * @see https://issues.civicrm.org/jira/browse/CRM-10451
        */
       if ($existingEntities->N == 1 && $existingEntities->id == CRM_Utils_Array::value('id', $params)) {
         $params['is_primary'] = 1;
diff --git a/CRM/Core/BAO/Job.php b/CRM/Core/BAO/Job.php
index c4214e60b526..e78458fd2c72 100644
--- a/CRM/Core/BAO/Job.php
+++ b/CRM/Core/BAO/Job.php
@@ -109,7 +109,7 @@ public static function del($jobID) {
   /**
    * Trim job table on a regular basis to keep it at a good size.
    *
-   * CRM-10513
+   * @see https://issues.civicrm.org/jira/browse/CRM-10513
    *
    * @param int $maxEntriesToKeep
    * @param int $minDaysToKeep
diff --git a/CRM/Core/Config.php b/CRM/Core/Config.php
index a27d424d6ae3..3243ebb2a36e 100644
--- a/CRM/Core/Config.php
+++ b/CRM/Core/Config.php
@@ -271,7 +271,7 @@ public static function environment($env = NULL, $reset = FALSE) {
 
   /**
    * Do general cleanup of caches, temp directories and temp tables
-   * CRM-8739
+   * @see https://issues.civicrm.org/jira/browse/CRM-8739
    *
    * @param bool $sessionReset
    */
diff --git a/CRM/Event/BAO/Participant.php b/CRM/Event/BAO/Participant.php
index 1a3e59a0bedb..aa0aaf61706a 100644
--- a/CRM/Event/BAO/Participant.php
+++ b/CRM/Event/BAO/Participant.php
@@ -1769,7 +1769,7 @@ public static function createDiscountTrxn($eventID, $contributionParams, $feeLev
   /**
    * Delete participants of contact.
    *
-   * CRM-12155
+   * @see https://issues.civicrm.org/jira/browse/CRM-12155
    *
    * @param int $contactId
    *   Contact id.
diff --git a/CRM/Event/Form/Registration/ParticipantConfirm.php b/CRM/Event/Form/Registration/ParticipantConfirm.php
index 5c1b850610a7..bf8a79203d69 100644
--- a/CRM/Event/Form/Registration/ParticipantConfirm.php
+++ b/CRM/Event/Form/Registration/ParticipantConfirm.php
@@ -21,10 +21,11 @@
  *
  */
 class CRM_Event_Form_Registration_ParticipantConfirm extends CRM_Event_Form_Registration {
-  // optional credit card return status code
+
   /**
-   * CRM-6060
+   * Optional credit card return status code
    * @var string
+   * @see https://issues.civicrm.org/jira/browse/CRM-6060
    */
   protected $_cc = NULL;
 
diff --git a/CRM/Event/Form/Registration/Register.php b/CRM/Event/Form/Registration/Register.php
index 80e3f7c72f95..0bb56e3e0e79 100644
--- a/CRM/Event/Form/Registration/Register.php
+++ b/CRM/Event/Form/Registration/Register.php
@@ -45,9 +45,9 @@ class CRM_Event_Form_Registration_Register extends CRM_Event_Form_Registration {
    * Skip duplicate check.
    *
    * This can be set using hook_civicrm_buildForm() to override the registration dupe check.
-   * CRM-7604
    *
    * @var bool
+   * @see https://issues.civicrm.org/jira/browse/CRM-7604
    */
   public $_skipDupeRegistrationCheck = FALSE;
 
diff --git a/CRM/Financial/BAO/FinancialItem.php b/CRM/Financial/BAO/FinancialItem.php
index 317fb8dadb7a..fb5dca3d1655 100644
--- a/CRM/Financial/BAO/FinancialItem.php
+++ b/CRM/Financial/BAO/FinancialItem.php
@@ -221,7 +221,7 @@ public static function retrieveEntityFinancialTrxn($params, $maxId = FALSE) {
   /**
    * Check if contact is present in financial_item table.
    *
-   * CRM-12929
+   * @see https://issues.civicrm.org/jira/browse/CRM-12929
    *
    * @param array $contactIds
    *   An array contact id's.
diff --git a/CRM/Financial/BAO/FinancialTypeAccount.php b/CRM/Financial/BAO/FinancialTypeAccount.php
index 17be41a40850..f7cb9652cb99 100644
--- a/CRM/Financial/BAO/FinancialTypeAccount.php
+++ b/CRM/Financial/BAO/FinancialTypeAccount.php
@@ -164,7 +164,7 @@ public static function getInstrumentFinancialAccount($paymentInstrumentValue) {
   /**
    * Create default entity financial accounts
    * for financial type
-   * CRM-12470
+   * @see https://issues.civicrm.org/jira/browse/CRM-12470
    *
    * @param $financialType
    *
diff --git a/CRM/Mailing/Event/BAO/Opened.php b/CRM/Mailing/Event/BAO/Opened.php
index f180fddb500f..1ecc0788399c 100644
--- a/CRM/Mailing/Event/BAO/Opened.php
+++ b/CRM/Mailing/Event/BAO/Opened.php
@@ -112,7 +112,7 @@ public static function getTotalCount(
   }
 
   /**
-   * CRM-12814
+   * @see https://issues.civicrm.org/jira/browse/CRM-12814
    * Get opened count for each mailing for a given set of mailing IDs
    *
    * @param $mailingIDs
diff --git a/CRM/Mailing/Event/BAO/TrackableURLOpen.php b/CRM/Mailing/Event/BAO/TrackableURLOpen.php
index 6c314f04b68f..856f577edb4a 100644
--- a/CRM/Mailing/Event/BAO/TrackableURLOpen.php
+++ b/CRM/Mailing/Event/BAO/TrackableURLOpen.php
@@ -169,7 +169,7 @@ public static function getTotalCount(
   /**
    * Get tracked url count for each mailing for a given set of mailing IDs.
    *
-   * CRM-12814
+   * @see https://issues.civicrm.org/jira/browse/CRM-12814
    *
    * @param array $mailingIDs
    *
diff --git a/CRM/Report/Form.php b/CRM/Report/Form.php
index 80308090e103..d202b845611e 100644
--- a/CRM/Report/Form.php
+++ b/CRM/Report/Form.php
@@ -153,9 +153,8 @@ class CRM_Report_Form extends CRM_Core_Form {
    * separately marked every class with a groupFilter in the hope that will trigger
    * people to fix them as they touch them.
    *
-   * CRM-19170
-   *
    * @var bool
+   * @see https://issues.civicrm.org/jira/browse/CRM-19170
    */
   protected $groupFilterNotOptimised = TRUE;
 
diff --git a/CRM/Report/Form/Activity.php b/CRM/Report/Form/Activity.php
index e0c5b6408eeb..6d430a5a2cdf 100644
--- a/CRM/Report/Form/Activity.php
+++ b/CRM/Report/Form/Activity.php
@@ -28,9 +28,8 @@ class CRM_Report_Form_Activity extends CRM_Report_Form {
    * all reports have been adjusted to take care of it. This report has not
    * and will run an inefficient query until fixed.
    *
-   * CRM-19170
-   *
    * @var bool
+   * @see https://issues.civicrm.org/jira/browse/CRM-19170
    */
   protected $groupFilterNotOptimised = TRUE;
 
diff --git a/CRM/Report/Form/ActivitySummary.php b/CRM/Report/Form/ActivitySummary.php
index 0e7e780f9159..fe5df2864992 100644
--- a/CRM/Report/Form/ActivitySummary.php
+++ b/CRM/Report/Form/ActivitySummary.php
@@ -28,9 +28,8 @@ class CRM_Report_Form_ActivitySummary extends CRM_Report_Form {
    * all reports have been adjusted to take care of it. This report has not
    * and will run an inefficient query until fixed.
    *
-   * CRM-19170
-   *
    * @var bool
+   * @see https://issues.civicrm.org/jira/browse/CRM-19170
    */
   protected $groupFilterNotOptimised = TRUE;
 
diff --git a/CRM/Report/Form/Case/Demographics.php b/CRM/Report/Form/Case/Demographics.php
index 6c9f105f8596..99346e02e79e 100644
--- a/CRM/Report/Form/Case/Demographics.php
+++ b/CRM/Report/Form/Case/Demographics.php
@@ -28,9 +28,8 @@ class CRM_Report_Form_Case_Demographics extends CRM_Report_Form {
    * all reports have been adjusted to take care of it. This report has not
    * and will run an inefficient query until fixed.
    *
-   * CRM-19170
-   *
    * @var bool
+   * @see https://issues.civicrm.org/jira/browse/CRM-19170
    */
   protected $groupFilterNotOptimised = TRUE;
 
diff --git a/CRM/Report/Form/Contact/CurrentEmployer.php b/CRM/Report/Form/Contact/CurrentEmployer.php
index 5a2479b14b64..7ad996b7a7ce 100644
--- a/CRM/Report/Form/Contact/CurrentEmployer.php
+++ b/CRM/Report/Form/Contact/CurrentEmployer.php
@@ -23,9 +23,8 @@ class CRM_Report_Form_Contact_CurrentEmployer extends CRM_Report_Form {
    * all reports have been adjusted to take care of it. This report has not
    * and will run an inefficient query until fixed.
    *
-   * CRM-19170
-   *
    * @var bool
+   * @see https://issues.civicrm.org/jira/browse/CRM-19170
    */
   protected $groupFilterNotOptimised = TRUE;
 
diff --git a/CRM/Report/Form/Contact/Detail.php b/CRM/Report/Form/Contact/Detail.php
index edbff9f3e92c..47c98364f3eb 100644
--- a/CRM/Report/Form/Contact/Detail.php
+++ b/CRM/Report/Form/Contact/Detail.php
@@ -33,9 +33,8 @@ class CRM_Report_Form_Contact_Detail extends CRM_Report_Form {
    * all reports have been adjusted to take care of it. This report has not
    * and will run an inefficient query until fixed.
    *
-   * CRM-19170
-   *
    * @var bool
+   * @see https://issues.civicrm.org/jira/browse/CRM-19170
    */
   protected $groupFilterNotOptimised = TRUE;
 
diff --git a/CRM/Report/Form/Contact/Relationship.php b/CRM/Report/Form/Contact/Relationship.php
index 9b7b5dc63da0..18ec0c724179 100644
--- a/CRM/Report/Form/Contact/Relationship.php
+++ b/CRM/Report/Form/Contact/Relationship.php
@@ -33,9 +33,8 @@ class CRM_Report_Form_Contact_Relationship extends CRM_Report_Form {
    * all reports have been adjusted to take care of it. This report has not
    * and will run an inefficient query until fixed.
    *
-   * CRM-19170
-   *
    * @var bool
+   * @see https://issues.civicrm.org/jira/browse/CRM-19170
    */
   protected $groupFilterNotOptimised = TRUE;
 
diff --git a/CRM/Report/Form/Contact/Summary.php b/CRM/Report/Form/Contact/Summary.php
index c920b08f7df6..9261fc6d0828 100644
--- a/CRM/Report/Form/Contact/Summary.php
+++ b/CRM/Report/Form/Contact/Summary.php
@@ -38,9 +38,8 @@ class CRM_Report_Form_Contact_Summary extends CRM_Report_Form {
    * all reports have been adjusted to take care of it. This report has not
    * and will run an inefficient query until fixed.
    *
-   * CRM-19170
-   *
    * @var bool
+   * @see https://issues.civicrm.org/jira/browse/CRM-19170
    */
   protected $groupFilterNotOptimised = TRUE;
 
diff --git a/CRM/Report/Form/Contribute/Bookkeeping.php b/CRM/Report/Form/Contribute/Bookkeeping.php
index ebec5bd42333..f70c7d29d190 100644
--- a/CRM/Report/Form/Contribute/Bookkeeping.php
+++ b/CRM/Report/Form/Contribute/Bookkeeping.php
@@ -32,9 +32,8 @@ class CRM_Report_Form_Contribute_Bookkeeping extends CRM_Report_Form {
    * all reports have been adjusted to take care of it. This report has not
    * and will run an inefficient query until fixed.
    *
-   * CRM-19170
-   *
    * @var bool
+   * @see https://issues.civicrm.org/jira/browse/CRM-19170
    */
   protected $groupFilterNotOptimised = TRUE;
 
diff --git a/CRM/Report/Form/Contribute/Detail.php b/CRM/Report/Form/Contribute/Detail.php
index c164f42cdfd9..14b5facbd9cb 100644
--- a/CRM/Report/Form/Contribute/Detail.php
+++ b/CRM/Report/Form/Contribute/Detail.php
@@ -59,9 +59,8 @@ class CRM_Report_Form_Contribute_Detail extends CRM_Report_Form {
   /**
    * This report has been optimised for group filtering.
    *
-   * CRM-19170
-   *
    * @var bool
+   * @see https://issues.civicrm.org/jira/browse/CRM-19170
    */
   protected $groupFilterNotOptimised = FALSE;
 
diff --git a/CRM/Report/Form/Contribute/Lybunt.php b/CRM/Report/Form/Contribute/Lybunt.php
index 4bba286d07e2..101717609d06 100644
--- a/CRM/Report/Form/Contribute/Lybunt.php
+++ b/CRM/Report/Form/Contribute/Lybunt.php
@@ -51,9 +51,8 @@ class CRM_Report_Form_Contribute_Lybunt extends CRM_Report_Form {
   /**
    * This report has been optimised for group filtering.
    *
-   * CRM-19170
-   *
    * @var bool
+   * @see https://issues.civicrm.org/jira/browse/CRM-19170
    */
   protected $groupFilterNotOptimised = FALSE;
 
diff --git a/CRM/Report/Form/Contribute/Recur.php b/CRM/Report/Form/Contribute/Recur.php
index 53996b276613..6f0109d2845e 100644
--- a/CRM/Report/Form/Contribute/Recur.php
+++ b/CRM/Report/Form/Contribute/Recur.php
@@ -23,9 +23,8 @@ class CRM_Report_Form_Contribute_Recur extends CRM_Report_Form {
    * all reports have been adjusted to take care of it. This report has not
    * and will run an inefficient query until fixed.
    *
-   * CRM-19170
-   *
    * @var bool
+   * @see https://issues.civicrm.org/jira/browse/CRM-19170
    */
   protected $groupFilterNotOptimised = TRUE;
 
diff --git a/CRM/Report/Form/Contribute/Repeat.php b/CRM/Report/Form/Contribute/Repeat.php
index aa4846c532f9..d5044a08e722 100644
--- a/CRM/Report/Form/Contribute/Repeat.php
+++ b/CRM/Report/Form/Contribute/Repeat.php
@@ -69,9 +69,8 @@ class CRM_Report_Form_Contribute_Repeat extends CRM_Report_Form {
   /**
    * This report has been optimised for group filtering.
    *
-   * CRM-19170
-   *
    * @var bool
+   * @see https://issues.civicrm.org/jira/browse/CRM-19170
    */
   protected $groupFilterNotOptimised = FALSE;
 
diff --git a/CRM/Report/Form/Contribute/SoftCredit.php b/CRM/Report/Form/Contribute/SoftCredit.php
index 4da214930de4..8370e7420319 100644
--- a/CRM/Report/Form/Contribute/SoftCredit.php
+++ b/CRM/Report/Form/Contribute/SoftCredit.php
@@ -41,9 +41,8 @@ class CRM_Report_Form_Contribute_SoftCredit extends CRM_Report_Form {
    * all reports have been adjusted to take care of it. This report has not
    * and will run an inefficient query until fixed.
    *
-   * CRM-19170
-   *
    * @var bool
+   * @see https://issues.civicrm.org/jira/browse/CRM-19170
    */
   protected $groupFilterNotOptimised = TRUE;
 
diff --git a/CRM/Report/Form/Contribute/Summary.php b/CRM/Report/Form/Contribute/Summary.php
index 29dd59842e0b..b7c40f5a199f 100644
--- a/CRM/Report/Form/Contribute/Summary.php
+++ b/CRM/Report/Form/Contribute/Summary.php
@@ -43,9 +43,8 @@ class CRM_Report_Form_Contribute_Summary extends CRM_Report_Form {
   /**
    * This report has been optimised for group filtering.
    *
-   * CRM-19170
-   *
    * @var bool
+   * @see https://issues.civicrm.org/jira/browse/CRM-19170
    */
   protected $groupFilterNotOptimised = FALSE;
 
diff --git a/CRM/Report/Form/Contribute/Sybunt.php b/CRM/Report/Form/Contribute/Sybunt.php
index ec142d1a4a31..1b45af360eec 100644
--- a/CRM/Report/Form/Contribute/Sybunt.php
+++ b/CRM/Report/Form/Contribute/Sybunt.php
@@ -33,9 +33,8 @@ class CRM_Report_Form_Contribute_Sybunt extends CRM_Report_Form {
   /**
    * This report has been optimised for group filtering.
    *
-   * CRM-19170
-   *
    * @var bool
+   * @see https://issues.civicrm.org/jira/browse/CRM-19170
    */
   protected $groupFilterNotOptimised = FALSE;
 
diff --git a/CRM/Report/Form/Contribute/TopDonor.php b/CRM/Report/Form/Contribute/TopDonor.php
index 72a7243df460..83d903950e66 100644
--- a/CRM/Report/Form/Contribute/TopDonor.php
+++ b/CRM/Report/Form/Contribute/TopDonor.php
@@ -30,9 +30,8 @@ class CRM_Report_Form_Contribute_TopDonor extends CRM_Report_Form {
    * all reports have been adjusted to take care of it. This report has not
    * and will run an inefficient query until fixed.
    *
-   * CRM-19170
-   *
    * @var bool
+   * @see https://issues.civicrm.org/jira/browse/CRM-19170
    */
   protected $groupFilterNotOptimised = TRUE;
 
diff --git a/CRM/Report/Form/Event/ParticipantListCount.php b/CRM/Report/Form/Event/ParticipantListCount.php
index 31a0f70ab16e..6e98f4be8be6 100644
--- a/CRM/Report/Form/Event/ParticipantListCount.php
+++ b/CRM/Report/Form/Event/ParticipantListCount.php
@@ -30,9 +30,8 @@ class CRM_Report_Form_Event_ParticipantListCount extends CRM_Report_Form {
    * all reports have been adjusted to take care of it. This report has not
    * and will run an inefficient query until fixed.
    *
-   * CRM-19170
-   *
    * @var bool
+   * @see https://issues.civicrm.org/jira/browse/CRM-19170
    */
   protected $groupFilterNotOptimised = TRUE;
 
diff --git a/CRM/Report/Form/Mailing/Bounce.php b/CRM/Report/Form/Mailing/Bounce.php
index cfb798c179f9..4df40865086b 100644
--- a/CRM/Report/Form/Mailing/Bounce.php
+++ b/CRM/Report/Form/Mailing/Bounce.php
@@ -42,9 +42,8 @@ class CRM_Report_Form_Mailing_Bounce extends CRM_Report_Form {
    * all reports have been adjusted to take care of it. This report has not
    * and will run an inefficient query until fixed.
    *
-   * CRM-19170
-   *
    * @var bool
+   * @see https://issues.civicrm.org/jira/browse/CRM-19170
    */
   protected $groupFilterNotOptimised = TRUE;
 
diff --git a/CRM/Report/Form/Mailing/Clicks.php b/CRM/Report/Form/Mailing/Clicks.php
index d3ef570d906e..7634844176f7 100644
--- a/CRM/Report/Form/Mailing/Clicks.php
+++ b/CRM/Report/Form/Mailing/Clicks.php
@@ -42,9 +42,8 @@ class CRM_Report_Form_Mailing_Clicks extends CRM_Report_Form {
    * all reports have been adjusted to take care of it. This report has not
    * and will run an inefficient query until fixed.
    *
-   * CRM-19170
-   *
    * @var bool
+   * @see https://issues.civicrm.org/jira/browse/CRM-19170
    */
   protected $groupFilterNotOptimised = TRUE;
 
diff --git a/CRM/Report/Form/Mailing/Detail.php b/CRM/Report/Form/Mailing/Detail.php
index 5eab237061e2..f6902c03b76b 100644
--- a/CRM/Report/Form/Mailing/Detail.php
+++ b/CRM/Report/Form/Mailing/Detail.php
@@ -32,9 +32,8 @@ class CRM_Report_Form_Mailing_Detail extends CRM_Report_Form {
    * all reports have been adjusted to take care of it. This report has not
    * and will run an inefficient query until fixed.
    *
-   * CRM-19170
-   *
    * @var bool
+   * @see https://issues.civicrm.org/jira/browse/CRM-19170
    */
   protected $groupFilterNotOptimised = TRUE;
 
diff --git a/CRM/Report/Form/Mailing/Opened.php b/CRM/Report/Form/Mailing/Opened.php
index 5db163b7eb4c..142d8d3d3295 100644
--- a/CRM/Report/Form/Mailing/Opened.php
+++ b/CRM/Report/Form/Mailing/Opened.php
@@ -42,9 +42,8 @@ class CRM_Report_Form_Mailing_Opened extends CRM_Report_Form {
    * all reports have been adjusted to take care of it. This report has not
    * and will run an inefficient query until fixed.
    *
-   * CRM-19170
-   *
    * @var bool
+   * @see https://issues.civicrm.org/jira/browse/CRM-19170
    */
   protected $groupFilterNotOptimised = TRUE;
 
diff --git a/CRM/Report/Form/Member/ContributionDetail.php b/CRM/Report/Form/Member/ContributionDetail.php
index 3fbc4f9c6041..69dd87b8c872 100644
--- a/CRM/Report/Form/Member/ContributionDetail.php
+++ b/CRM/Report/Form/Member/ContributionDetail.php
@@ -31,9 +31,8 @@ class CRM_Report_Form_Member_ContributionDetail extends CRM_Report_Form {
    * all reports have been adjusted to take care of it. This report has not
    * and will run an inefficient query until fixed.
    *
-   * CRM-19170
-   *
    * @var bool
+   * @see https://issues.civicrm.org/jira/browse/CRM-19170
    */
   protected $groupFilterNotOptimised = TRUE;
 
diff --git a/CRM/Report/Form/Member/Detail.php b/CRM/Report/Form/Member/Detail.php
index 425695ac8ab2..67ced4a65037 100644
--- a/CRM/Report/Form/Member/Detail.php
+++ b/CRM/Report/Form/Member/Detail.php
@@ -35,10 +35,8 @@ class CRM_Report_Form_Member_Detail extends CRM_Report_Form {
    * The functionality for group filtering has been improved but not
    * all reports have been adjusted to take care of it. This report has not
    * and will run an inefficient query until fixed.
-   *
-   * CRM-19170
-   *
    * @var bool
+   * @see https://issues.civicrm.org/jira/browse/CRM-19170
    */
   protected $groupFilterNotOptimised = FALSE;
 
diff --git a/CRM/Report/Form/Member/Lapse.php b/CRM/Report/Form/Member/Lapse.php
index 9b0f12b24357..864c70ef34c8 100644
--- a/CRM/Report/Form/Member/Lapse.php
+++ b/CRM/Report/Form/Member/Lapse.php
@@ -30,9 +30,8 @@ class CRM_Report_Form_Member_Lapse extends CRM_Report_Form {
    * all reports have been adjusted to take care of it. This report has not
    * and will run an inefficient query until fixed.
    *
-   * CRM-19170
-   *
    * @var bool
+   * @see https://issues.civicrm.org/jira/browse/CRM-19170
    */
   protected $groupFilterNotOptimised = TRUE;
 
diff --git a/CRM/Report/Form/Member/Summary.php b/CRM/Report/Form/Member/Summary.php
index 1bd21077b7ca..7cb3dd125ff1 100644
--- a/CRM/Report/Form/Member/Summary.php
+++ b/CRM/Report/Form/Member/Summary.php
@@ -36,9 +36,8 @@ class CRM_Report_Form_Member_Summary extends CRM_Report_Form {
    * all reports have been adjusted to take care of it. This report has not
    * and will run an inefficient query until fixed.
    *
-   * CRM-19170
-   *
    * @var bool
+   * @see https://issues.civicrm.org/jira/browse/CRM-19170
    */
   protected $groupFilterNotOptimised = TRUE;
 
diff --git a/CRM/Report/Form/Pledge/Detail.php b/CRM/Report/Form/Pledge/Detail.php
index d8e66c78e5ea..75de4ab4e77c 100644
--- a/CRM/Report/Form/Pledge/Detail.php
+++ b/CRM/Report/Form/Pledge/Detail.php
@@ -42,9 +42,8 @@ class CRM_Report_Form_Pledge_Detail extends CRM_Report_Form {
    * all reports have been adjusted to take care of it. This report has not
    * and will run an inefficient query until fixed.
    *
-   * CRM-19170
-   *
    * @var bool
+   * @see https://issues.civicrm.org/jira/browse/CRM-19170
    */
   protected $groupFilterNotOptimised = TRUE;
 
diff --git a/CRM/Report/Form/Pledge/Summary.php b/CRM/Report/Form/Pledge/Summary.php
index 042a06ce1e9e..d3f853e806ba 100644
--- a/CRM/Report/Form/Pledge/Summary.php
+++ b/CRM/Report/Form/Pledge/Summary.php
@@ -28,9 +28,8 @@ class CRM_Report_Form_Pledge_Summary extends CRM_Report_Form {
    * all reports have been adjusted to take care of it. This report has not
    * and will run an inefficient query until fixed.
    *
-   * CRM-19170
-   *
    * @var bool
+   * @see https://issues.civicrm.org/jira/browse/CRM-19170
    */
   protected $groupFilterNotOptimised = TRUE;
 
diff --git a/CRM/Upgrade/Incremental/php/FourSeven.php b/CRM/Upgrade/Incremental/php/FourSeven.php
index 28267eebaccb..74f190a0f203 100644
--- a/CRM/Upgrade/Incremental/php/FourSeven.php
+++ b/CRM/Upgrade/Incremental/php/FourSeven.php
@@ -515,7 +515,7 @@ public function upgrade_4_7_32($rev) {
   //  }
 
   /**
-   * CRM-16354
+   * @see https://issues.civicrm.org/jira/browse/CRM-16354
    *
    * @return int
    */
@@ -1249,7 +1249,7 @@ public static function deprecateStateProvinces($countryID, $provinces) {
   }
 
   /**
-   * CRM-19961
+   * @see https://issues.civicrm.org/jira/browse/CRM-19961
    * Poputate newly added domain id column and add foriegn key onto table.
    */
   public static function populateSMSProviderDomainId() {
diff --git a/CRM/Utils/Check/Component/AddressParsing.php b/CRM/Utils/Check/Component/AddressParsing.php
index 815402b48e1a..0d42a1771c6d 100644
--- a/CRM/Utils/Check/Component/AddressParsing.php
+++ b/CRM/Utils/Check/Component/AddressParsing.php
@@ -16,6 +16,9 @@
  */
 class CRM_Utils_Check_Component_AddressParsing extends CRM_Utils_Check_Component {
 
+  /**
+   * @return CRM_Utils_Check_Message[]
+   */
   public static function checkLocaleSupportsAddressParsing() {
 
     $addressOptions = CRM_Core_BAO_Setting::valueOptions(
diff --git a/CRM/Utils/Check/Component/Case.php b/CRM/Utils/Check/Component/Case.php
index 44203c904980..1112b72093bb 100644
--- a/CRM/Utils/Check/Component/Case.php
+++ b/CRM/Utils/Check/Component/Case.php
@@ -46,7 +46,7 @@ public function isEnabled() {
   /**
    * Check that the case-type names don't rely on double-munging.
    *
-   * @return array<CRM_Utils_Check_Message>
+   * @return CRM_Utils_Check_Message[]
    *   An empty array, or a list of warnings
    */
   public function checkCaseTypeNameConsistency() {
@@ -105,7 +105,7 @@ public function checkCaseTypeNameConsistency() {
   /**
    * Check that the timestamp columns are populated. (CRM-20958)
    *
-   * @return array<CRM_Utils_Check_Message>
+   * @return CRM_Utils_Check_Message[]
    *   An empty array, or a list of warnings
    */
   public function checkNullTimestamps() {
@@ -149,7 +149,7 @@ public function checkNullTimestamps() {
   /**
    * Check that the relationship types aren't going to cause problems.
    *
-   * @return array<CRM_Utils_Check_Message>
+   * @return CRM_Utils_Check_Message[]
    *   An empty array, or a list of warnings
    */
   public function checkRelationshipTypeProblems() {
@@ -387,7 +387,7 @@ public function checkRelationshipTypeProblems() {
    * We don't have to think about edge cases because there are already
    * status checks above for those.
    *
-   * @return array<CRM_Utils_Check_Message>
+   * @return CRM_Utils_Check_Message[]
    *   An empty array, or a list of warnings
    */
   public function checkExternalXmlFileRoleNames() {
diff --git a/CRM/Utils/Check/Component/Cms.php b/CRM/Utils/Check/Component/Cms.php
index 663d68037c05..a1e8610db44f 100644
--- a/CRM/Utils/Check/Component/Cms.php
+++ b/CRM/Utils/Check/Component/Cms.php
@@ -19,8 +19,7 @@ class CRM_Utils_Check_Component_Cms extends CRM_Utils_Check_Component {
   /**
    * For sites running in WordPress, make sure the configured base page exists.
    *
-   * @return array
-   *   Instances of CRM_Utils_Check_Message
+   * @return CRM_Utils_Check_Message[]
    */
   public static function checkWpBasePage() {
     $config = CRM_Core_Config::singleton();
diff --git a/CRM/Utils/Check/Component/Env.php b/CRM/Utils/Check/Component/Env.php
index a81de7792c09..76ae62ca5f78 100644
--- a/CRM/Utils/Check/Component/Env.php
+++ b/CRM/Utils/Check/Component/Env.php
@@ -17,7 +17,7 @@
 class CRM_Utils_Check_Component_Env extends CRM_Utils_Check_Component {
 
   /**
-   * @return array
+   * @return CRM_Utils_Check_Message[]
    */
   public function checkPhpVersion() {
     $messages = [];
@@ -82,7 +82,7 @@ public function checkPhpVersion() {
   }
 
   /**
-   * @return array
+   * @return CRM_Utils_Check_Message[]
    */
   public function checkPhpMysqli() {
     $messages = [];
@@ -107,7 +107,7 @@ public function checkPhpMysqli() {
   /**
    * Check that the MySQL time settings match the PHP time settings.
    *
-   * @return array<CRM_Utils_Check_Message> an empty array, or a list of warnings
+   * @return CRM_Utils_Check_Message[]
    */
   public function checkMysqlTime() {
     $messages = [];
@@ -131,7 +131,7 @@ public function checkMysqlTime() {
   }
 
   /**
-   * @return array
+   * @return CRM_Utils_Check_Message[]
    */
   public function checkDebug() {
     $config = CRM_Core_Config::singleton();
@@ -157,7 +157,7 @@ public function checkDebug() {
   }
 
   /**
-   * @return array
+   * @return CRM_Utils_Check_Message[]
    */
   public function checkOutboundMail() {
     $messages = [];
@@ -188,7 +188,7 @@ public function checkOutboundMail() {
 
   /**
    * Check that domain email and org name are set
-   * @return array
+   * @return CRM_Utils_Check_Message[]
    */
   public function checkDomainNameEmail() {
     $messages = [];
@@ -238,7 +238,7 @@ public function checkDomainNameEmail() {
 
   /**
    * Checks if a default bounce handling mailbox is set up
-   * @return array
+   * @return CRM_Utils_Check_Message[]
    */
   public function checkDefaultMailbox() {
     $messages = [];
@@ -273,7 +273,7 @@ public function checkDefaultMailbox() {
 
   /**
    * Checks if cron has run in the past hour (3600 seconds)
-   * @return array
+   * @return CRM_Utils_Check_Message[]
    * @throws CRM_Core_Exception
    */
   public function checkLastCron() {
@@ -337,7 +337,7 @@ public function checkLastCron() {
 
   /**
    * Recommend that sites use path-variables for their directories and URLs.
-   * @return array
+   * @return CRM_Utils_Check_Message[]
    */
   public function checkUrlVariables() {
     $messages = [];
@@ -374,7 +374,7 @@ public function checkUrlVariables() {
 
   /**
    * Recommend that sites use path-variables for their directories and URLs.
-   * @return array
+   * @return CRM_Utils_Check_Message[]
    */
   public function checkDirVariables() {
     $messages = [];
@@ -414,8 +414,7 @@ public function checkDirVariables() {
   /**
    * Check that important directories are writable.
    *
-   * @return array
-   *   Any CRM_Utils_Check_Message instances that need to be generated.
+   * @return CRM_Utils_Check_Message[]
    */
   public function checkDirsWritable() {
     $notWritable = [];
@@ -463,7 +462,7 @@ public function checkDirsWritable() {
 
   /**
    * Checks if new versions are available
-   * @return array
+   * @return CRM_Utils_Check_Message[]
    */
   public function checkVersion() {
     $messages = [];
@@ -513,7 +512,7 @@ public function checkVersion() {
 
   /**
    * Checks if extensions are set up properly
-   * @return array
+   * @return CRM_Utils_Check_Message[]
    */
   public function checkExtensions() {
     $messages = [];
@@ -708,7 +707,7 @@ public function checkExtensions() {
   /**
    * Checks if there are pending extension upgrades.
    *
-   * @return array
+   * @return CRM_Utils_Check_Message[]
    */
   public function checkExtensionUpgrades() {
     if (CRM_Extension_Upgrades::hasPending()) {
@@ -732,7 +731,7 @@ public function checkExtensionUpgrades() {
 
   /**
    * Checks if CiviCRM database version is up-to-date
-   * @return array
+   * @return CRM_Utils_Check_Message[]
    */
   public function checkDbVersion() {
     $messages = [];
@@ -801,8 +800,8 @@ public function checkDbVersion() {
   }
 
   /**
-   * ensure that all CiviCRM tables are InnoDB
-   * @return array
+   * Ensure that all CiviCRM tables are InnoDB
+   * @return CRM_Utils_Check_Message[]
    */
   public function checkDbEngine() {
     $messages = [];
@@ -820,8 +819,8 @@ public function checkDbEngine() {
   }
 
   /**
-   * ensure reply id is set to any default value
-   * @return array
+   * Ensure reply id is set to any default value
+   * @return CRM_Utils_Check_Message[]
    */
   public function checkReplyIdForMailing() {
     $messages = [];
@@ -845,7 +844,7 @@ public function checkReplyIdForMailing() {
 
   /**
    * Check for required mbstring extension
-   * @return array
+   * @return CRM_Utils_Check_Message[]
    */
   public function checkMbstring() {
     $messages = [];
@@ -864,7 +863,7 @@ public function checkMbstring() {
 
   /**
    * Check if environment is Production.
-   * @return array
+   * @return CRM_Utils_Check_Message[]
    */
   public function checkEnvironment() {
     $messages = [];
@@ -885,7 +884,7 @@ public function checkEnvironment() {
   /**
    * Check for utf8mb4 support by MySQL.
    *
-   * @return array<CRM_Utils_Check_Message> an empty array, or a list of warnings
+   * @return CRM_Utils_Check_Message[]
    */
   public function checkMysqlUtf8mb4() {
     $messages = [];
diff --git a/CRM/Utils/Check/Component/FinancialTypeAcls.php b/CRM/Utils/Check/Component/FinancialTypeAcls.php
index c46e93152bfa..05601e0778ab 100644
--- a/CRM/Utils/Check/Component/FinancialTypeAcls.php
+++ b/CRM/Utils/Check/Component/FinancialTypeAcls.php
@@ -16,6 +16,10 @@
  */
 class CRM_Utils_Check_Component_FinancialTypeAcls extends CRM_Utils_Check_Component {
 
+  /**
+   * @return CRM_Utils_Check_Message[]
+   * @throws CiviCRM_API3_Exception
+   */
   public static function checkFinancialAclReport() {
     $messages = [];
     $ftAclSetting = Civi::settings()->get('acl_financial_type');
diff --git a/CRM/Utils/Check/Component/OptionGroups.php b/CRM/Utils/Check/Component/OptionGroups.php
index 77a1679a1472..a47303ad0de0 100644
--- a/CRM/Utils/Check/Component/OptionGroups.php
+++ b/CRM/Utils/Check/Component/OptionGroups.php
@@ -17,7 +17,7 @@
 class CRM_Utils_Check_Component_OptionGroups extends CRM_Utils_Check_Component {
 
   /**
-   * @return array
+   * @return CRM_Utils_Check_Message[]
    */
   public function checkOptionGroupValues() {
     $messages = [];
diff --git a/CRM/Utils/Check/Component/PriceFields.php b/CRM/Utils/Check/Component/PriceFields.php
index cfb6cf711441..03816c98fe7c 100644
--- a/CRM/Utils/Check/Component/PriceFields.php
+++ b/CRM/Utils/Check/Component/PriceFields.php
@@ -19,7 +19,7 @@ class CRM_Utils_Check_Component_PriceFields extends CRM_Utils_Check_Component {
 
   /**
    * Display warning about invalid priceFields
-   *
+   * @return CRM_Utils_Check_Message[]
    */
   public function checkPriceFields() {
     $sql = "SELECT DISTINCT ps.title as ps_title, ps.id as ps_id, psf.label as psf_label
diff --git a/CRM/Utils/Check/Component/Schema.php b/CRM/Utils/Check/Component/Schema.php
index c1333dfa051e..4e9e9c7ed7e0 100644
--- a/CRM/Utils/Check/Component/Schema.php
+++ b/CRM/Utils/Check/Component/Schema.php
@@ -19,7 +19,7 @@ class CRM_Utils_Check_Component_Schema extends CRM_Utils_Check_Component {
   /**
    * Check defined indices exist.
    *
-   * @return array
+   * @return CRM_Utils_Check_Message[]
    * @throws \CiviCRM_API3_Exception
    */
   public function checkIndices() {
@@ -62,7 +62,7 @@ public function checkIndices() {
   }
 
   /**
-   * @return array
+   * @return CRM_Utils_Check_Message[]
    */
   public function checkMissingLogTables() {
     $messages = [];
@@ -91,7 +91,7 @@ public function checkMissingLogTables() {
   /**
    * Check that no smart groups exist that contain deleted custom fields.
    *
-   * @return array
+   * @return CRM_Utils_Check_Message[]
    */
   public function checkSmartGroupCustomFieldCriteria() {
     if (CRM_Core_BAO_Domain::isDBUpdateRequired()) {
@@ -182,6 +182,9 @@ public function checkSmartGroupCustomFieldCriteria() {
     return $messages;
   }
 
+  /**
+   * @return CRM_Utils_Check_Message[]
+   */
   public function checkMoneyValueFormatConfig() {
     $messages = [];
     if (CRM_Core_Config::singleton()->moneyvalueformat !== '%!i') {
diff --git a/CRM/Utils/Check/Component/Security.php b/CRM/Utils/Check/Component/Security.php
index 98f7b67267bf..943add05d432 100644
--- a/CRM/Utils/Check/Component/Security.php
+++ b/CRM/Utils/Check/Component/Security.php
@@ -20,6 +20,7 @@ class CRM_Utils_Check_Component_Security extends CRM_Utils_Check_Component {
    * CMS have a different pattern to their default file path and URL.
    *
    * @todo Use Civi::paths instead?
+   * @return string
    */
   public function getFilePathMarker() {
     $config = CRM_Core_Config::singleton();
@@ -47,8 +48,7 @@ public function getFilePathMarker() {
    * is browseable or visible to search engines; it means it can be
    * requested directly.
    *
-   * @return array
-   *   Array of messages
+   * @return CRM_Utils_Check_Message[]
    * @see CRM-14091
    */
   public function checkLogFileIsNotAccessible() {
@@ -100,8 +100,7 @@ public function checkLogFileIsNotAccessible() {
    * Being retrievable doesn't mean the files are browseable or visible
    * to search engines; it only means they can be requested directly.
    *
-   * @return array
-   *   Array of messages
+   * @return CRM_Utils_Check_Message[]
    * @see CRM-14091
    *
    * @todo Test with WordPress, Joomla.
@@ -148,8 +147,7 @@ public function checkUploadsAreNotAccessible() {
    * MAY trigger false positives (if you have files named 'a', 'e'
    * we'll probably match that).
    *
-   * @return array
-   *   Array of messages
+   * @return CRM_Utils_Check_Message[]
    * @see CRM-14091
    *
    * @todo Test with WordPress, Joomla.
@@ -192,7 +190,7 @@ public function checkDirectoriesAreNotBrowseable() {
    * These files have generally been deleted but Civi source tree but could be
    * left online if one does a faulty upgrade.
    *
-   * @return array of messages
+   * @return CRM_Utils_Check_Message[]
    */
   public function checkFilesAreNotPresent() {
     $packages_path = rtrim(\Civi::paths()->getPath('[civicrm.packages]/'), '/' . DIRECTORY_SEPARATOR);
@@ -241,6 +239,7 @@ public function checkFilesAreNotPresent() {
 
   /**
    * Discourage use of remote profile forms.
+   * @return CRM_Utils_Check_Message[]
    */
   public function checkRemoteProfile() {
     $messages = [];
@@ -261,8 +260,8 @@ public function checkRemoteProfile() {
   }
 
   /**
-   * Check that the sysadmin has not modified the Cxn
-   * security setup.
+   * Check that the sysadmin has not modified the Cxn security setup.
+   * @return CRM_Utils_Check_Message[]
    */
   public function checkCxnOverrides() {
     $list = [];
diff --git a/CRM/Utils/Check/Component/Source.php b/CRM/Utils/Check/Component/Source.php
index 7a31d3341aa3..683f7cd3e38f 100644
--- a/CRM/Utils/Check/Component/Source.php
+++ b/CRM/Utils/Check/Component/Source.php
@@ -58,7 +58,7 @@ public function getRemovedFiles() {
   }
 
   /**
-   * @return array
+   * @return CRM_Utils_Check_Message[]
    *   Each item is an array with keys:
    *     - name: string, an abstract name
    *     - path: string, a full file path
@@ -99,7 +99,7 @@ public function findOrphanedFiles() {
   }
 
   /**
-   * @return array
+   * @return CRM_Utils_Check_Message[]
    */
   public function checkOrphans() {
     $orphans = $this->findOrphanedFiles();
diff --git a/CRM/Utils/Check/Component/Timestamps.php b/CRM/Utils/Check/Component/Timestamps.php
index 3e9808acadef..432a011e5f69 100644
--- a/CRM/Utils/Check/Component/Timestamps.php
+++ b/CRM/Utils/Check/Component/Timestamps.php
@@ -21,7 +21,7 @@ class CRM_Utils_Check_Component_Timestamps extends CRM_Utils_Check_Component {
   /**
    * Check that various columns are TIMESTAMP and not DATETIME. (CRM-9683, etal)
    *
-   * @return array
+   * @return CRM_Utils_Check_Message[]
    */
   public function checkSchema() {
     $problems = [];
diff --git a/Civi/Test/ContactTestTrait.php b/Civi/Test/ContactTestTrait.php
index efb0b146e27b..26991ea8cfdf 100644
--- a/Civi/Test/ContactTestTrait.php
+++ b/Civi/Test/ContactTestTrait.php
@@ -18,7 +18,7 @@ trait ContactTestTrait {
   /**
    * Emulate a logged in user since certain functions use that.
    * value to store a record in the DB (like activity)
-   * CRM-8180
+   * @see https://issues.civicrm.org/jira/browse/CRM-8180
    *
    * @return int
    *   Contact ID of the created user.
diff --git a/tests/phpunit/CRM/Contact/BAO/QueryTest.php b/tests/phpunit/CRM/Contact/BAO/QueryTest.php
index 69495e08e72c..e6ef3bd8b5b2 100644
--- a/tests/phpunit/CRM/Contact/BAO/QueryTest.php
+++ b/tests/phpunit/CRM/Contact/BAO/QueryTest.php
@@ -511,7 +511,7 @@ public function testGroupContactCacheAddSearch() {
   /**
    * Test smart groups with non-numeric don't fail on range queries.
    *
-   * CRM-14720
+   * @see https://issues.civicrm.org/jira/browse/CRM-14720
    *
    * @throws \CRM_Core_Exception
    */
@@ -586,7 +586,7 @@ public function testCaseInsensitive() {
   /**
    * Test smart groups with non-numeric don't fail on equal queries.
    *
-   * CRM-14720
+   * @see https://issues.civicrm.org/jira/browse/CRM-14720
    *
    * @throws \CRM_Core_Exception
    */
diff --git a/tests/phpunit/CRM/Contact/Import/Parser/ContactTest.php b/tests/phpunit/CRM/Contact/Import/Parser/ContactTest.php
index 536c9e08bb3b..d6e4ea58a2d2 100644
--- a/tests/phpunit/CRM/Contact/Import/Parser/ContactTest.php
+++ b/tests/phpunit/CRM/Contact/Import/Parser/ContactTest.php
@@ -158,7 +158,7 @@ public function testImportParserWithUpdateWithExternalIdentifier() {
    *
    * In this case no primary match exists (e.g the details are not supplied) so it falls back on external identifier.
    *
-   * CRM-17275
+   * @see https://issues.civicrm.org/jira/browse/CRM-17275
    *
    * @throws \Exception
    */
@@ -183,7 +183,7 @@ public function testImportParserWithUpdateWithExternalIdentifierButNoPrimaryMatc
    *
    * In this case no primary match exists (e.g the details are not supplied) so it falls back on external identifier.
    *
-   * CRM-17275
+   * @see https://issues.civicrm.org/jira/browse/CRM-17275
    *
    * @throws \Exception
    */
diff --git a/tests/phpunit/CRM/Core/BAO/ActionScheduleTest.php b/tests/phpunit/CRM/Core/BAO/ActionScheduleTest.php
index d173b7ea941a..e46626e3467e 100644
--- a/tests/phpunit/CRM/Core/BAO/ActionScheduleTest.php
+++ b/tests/phpunit/CRM/Core/BAO/ActionScheduleTest.php
@@ -2319,7 +2319,7 @@ public function deleteTestObjects() {
 
   /**
    * Test that the various repetition units work correctly.
-   * CRM-17028
+   * @see https://issues.civicrm.org/jira/browse/CRM-17028
    */
   public function testRepetitionFrequencyUnit() {
     $membershipTypeParams = [
diff --git a/tests/phpunit/CRM/Event/BAO/AdditionalPaymentTest.php b/tests/phpunit/CRM/Event/BAO/AdditionalPaymentTest.php
index b5dcf0133a56..8d0c38befc1e 100644
--- a/tests/phpunit/CRM/Event/BAO/AdditionalPaymentTest.php
+++ b/tests/phpunit/CRM/Event/BAO/AdditionalPaymentTest.php
@@ -194,7 +194,7 @@ public function testPaymentWithCustomPaymentInstrument() {
   }
 
   /**
-   * CRM-13964
+   * @see https://issues.civicrm.org/jira/browse/CRM-13964
    *
    * @throws \CRM_Core_Exception
    */
diff --git a/tests/phpunit/CRM/SMS/BAO/ProviderTest.php b/tests/phpunit/CRM/SMS/BAO/ProviderTest.php
index 43b552f06158..17a61c2feadb 100644
--- a/tests/phpunit/CRM/SMS/BAO/ProviderTest.php
+++ b/tests/phpunit/CRM/SMS/BAO/ProviderTest.php
@@ -62,7 +62,7 @@ public function testCreateAndUpdateProvider() {
   }
 
   /**
-   * CRM-20989
+   * @see https://issues.civicrm.org/jira/browse/CRM-20989
    * Add unit test to ensure that filtering by domain works in get Active Providers
    */
   public function testActiveProviderCount() {
diff --git a/tests/phpunit/CRM/Utils/StringTest.php b/tests/phpunit/CRM/Utils/StringTest.php
index 7fad15bb2aab..be31cfa8d02c 100644
--- a/tests/phpunit/CRM/Utils/StringTest.php
+++ b/tests/phpunit/CRM/Utils/StringTest.php
@@ -229,8 +229,8 @@ public function testFilterByWildCards($patterns, $expectedResults) {
   }
 
   /**
-   * CRM-20821
-   * CRM-14283
+   * @see https://issues.civicrm.org/jira/browse/CRM-20821
+   * @see https://issues.civicrm.org/jira/browse/CRM-14283
    *
    * @param string $imageURL
    * @param book $forceHttps
diff --git a/tests/phpunit/api/v3/ACLPermissionTest.php b/tests/phpunit/api/v3/ACLPermissionTest.php
index ed1190ee01cc..be9b40228510 100644
--- a/tests/phpunit/api/v3/ACLPermissionTest.php
+++ b/tests/phpunit/api/v3/ACLPermissionTest.php
@@ -806,7 +806,7 @@ public function testGetActivityACLSourceContactDeleted($version) {
 
   /**
    * Test get activities multiple ids with check permissions
-   * CRM-20441
+   * @see https://issues.civicrm.org/jira/browse/CRM-20441
    * @param int $version
    * @dataProvider versionThreeAndFour
    */
@@ -832,7 +832,7 @@ public function testActivitiesGetMultipleIdsCheckPermissions($version) {
   /**
    * Test get activities multiple ids with check permissions
    * Limit access to One contact
-   * CRM-20441
+   * @see https://issues.civicrm.org/jira/browse/CRM-20441
    * @param int $version
    * @dataProvider versionThreeAndFour
    */
@@ -868,7 +868,7 @@ public function testActivitiesGetMultipleIdsCheckPermissionsLimitedACL($version)
 
   /**
    * Test get activities multiple ids with check permissions
-   * CRM-20441
+   * @see https://issues.civicrm.org/jira/browse/CRM-20441
    * @param int $version
    * @dataProvider versionThreeAndFour
    */
diff --git a/tests/phpunit/api/v3/ContactTest.php b/tests/phpunit/api/v3/ContactTest.php
index 17218d3de494..bea3aed15ce4 100644
--- a/tests/phpunit/api/v3/ContactTest.php
+++ b/tests/phpunit/api/v3/ContactTest.php
@@ -2841,7 +2841,7 @@ public function testContactCreateFormatIsSuccessFalse($version) {
   /**
    * Test long display names.
    *
-   * CRM-21258
+   * @see https://issues.civicrm.org/jira/browse/CRM-21258
    *
    * @param int $version
    *
@@ -4120,7 +4120,7 @@ public function testMergedGet() {
    * We are checking that there is no error due to attempting to add an activity for the
    * deleted contact.
    *
-   * CRM-18307
+   * @see https://issues.civicrm.org/jira/browse/CRM-18307
    */
   public function testMergeNoTrash() {
     $this->createLoggedInUser();
@@ -4138,7 +4138,7 @@ public function testMergeNoTrash() {
   /**
    * Ensure format with return=group shows comma-separated group IDs.
    *
-   * CRM-19426
+   * @see https://issues.civicrm.org/jira/browse/CRM-19426
    *
    * @throws \CRM_Core_Exception
    */
diff --git a/tests/phpunit/api/v3/ContributionPageTest.php b/tests/phpunit/api/v3/ContributionPageTest.php
index dcf684ea7d34..25eb05e65f4d 100644
--- a/tests/phpunit/api/v3/ContributionPageTest.php
+++ b/tests/phpunit/api/v3/ContributionPageTest.php
@@ -284,7 +284,7 @@ public function testSubmitNewBillingNameDoNotOverwrite() {
   /**
    * Test process with instant payment when more than one configured for the page.
    *
-   * CRM-16923
+   * @see https://issues.civicrm.org/jira/browse/CRM-16923
    *
    * @throws \CiviCRM_API3_Exception
    * @throws \CRM_Core_Exception
diff --git a/tests/phpunit/api/v3/ExtensionTest.php b/tests/phpunit/api/v3/ExtensionTest.php
index f804ce26f9e2..bcfc8f9f4ba5 100644
--- a/tests/phpunit/api/v3/ExtensionTest.php
+++ b/tests/phpunit/api/v3/ExtensionTest.php
@@ -43,7 +43,7 @@ public function testGetremote() {
 
   /**
    * Test getting a single extension
-   * CRM-20532
+   * @see https://issues.civicrm.org/jira/browse/CRM-20532
    */
   public function testExtensionGetSingleExtension() {
     $result = $this->callAPISuccess('extension', 'get', ['key' => 'test.extension.manager.moduletest']);
@@ -54,7 +54,7 @@ public function testExtensionGetSingleExtension() {
 
   /**
    * Test single Extension get with specific fields in return
-   * CRM-20532
+   * @see https://issues.civicrm.org/jira/browse/CRM-20532
    */
   public function testSingleExtensionGetWithReturnFields() {
     $result = $this->callAPISuccess('extension', 'get', ['key' => 'test.extension.manager.moduletest', 'return' => ['name', 'status', 'key']]);
@@ -67,7 +67,7 @@ public function testSingleExtensionGetWithReturnFields() {
   /**
    * Test Extension Get returns detailed information
    * Note that this is likely to fail locally but will work on Jenkins due to the result count check
-   * CRM-20532
+   * @see https://issues.civicrm.org/jira/browse/CRM-20532
    */
   public function testExtensionGet() {
     $result = $this->callAPISuccess('extension', 'get', ['options' => ['limit' => 0]]);