diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 51b1b8ba0..5390cb9fa 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -134,7 +134,8 @@
       "integrity": "sha1-HAPA8PaBvJRYcoaMPbLthLvCFXE="
     },
     "angular-intro.js": {
-      "version": "github:appirio-tech/angular-intro.js#81610d6c3f03437d5cc38211482d43385e2d7be9"
+      "version": "github:appirio-tech/angular-intro.js#81610d6c3f03437d5cc38211482d43385e2d7be9",
+      "from": "github:appirio-tech/angular-intro.js#81610d6c3f03437d5cc38211482d43385e2d7be9"
     },
     "angular-jwt": {
       "version": "0.0.9",
@@ -268,6 +269,11 @@
             "lodash": "3.10.1"
           },
           "dependencies": {
+            "bluebird": {
+              "version": "3.5.0",
+              "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.0.tgz",
+              "integrity": "sha1-eRQg1/VR7qKJdFOop3ZT+WYG1nw="
+            },
             "lodash": {
               "version": "3.10.1",
               "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz",
@@ -375,6 +381,7 @@
     },
     "appirio-tech-react-components": {
       "version": "github:appirio-tech/react-components#25a102b55c1769fe2b42a222d37359f09dc24763",
+      "from": "github:appirio-tech/react-components#25a102b55c1769fe2b42a222d37359f09dc24763",
       "requires": {
         "appirio-styles": "0.0.26",
         "appirio-tech-api-schemas": "5.0.70",
@@ -409,6 +416,11 @@
             "node-neat": "1.7.2"
           }
         },
+        "moment": {
+          "version": "2.18.1",
+          "resolved": "https://registry.npmjs.org/moment/-/moment-2.18.1.tgz",
+          "integrity": "sha1-w2GT3Tzhwu7SrbfIAtu8d6gbHA8="
+        },
         "react-input-autosize": {
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/react-input-autosize/-/react-input-autosize-2.0.1.tgz",
@@ -653,7 +665,8 @@
       },
       "dependencies": {
         "qs": {
-          "version": "git+https://github.com/jfromaniello/node-querystring.git#5d96513991635e3e22d7aa54a8584d6ce97cace8"
+          "version": "git+https://github.com/jfromaniello/node-querystring.git#5d96513991635e3e22d7aa54a8584d6ce97cace8",
+          "from": "git+https://github.com/jfromaniello/node-querystring.git#5d96513991635e3e22d7aa54a8584d6ce97cace8"
         }
       }
     },
@@ -1684,9 +1697,9 @@
       }
     },
     "bluebird": {
-      "version": "3.5.0",
-      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.0.tgz",
-      "integrity": "sha1-eRQg1/VR7qKJdFOop3ZT+WYG1nw="
+      "version": "2.9.2",
+      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-2.9.2.tgz",
+      "integrity": "sha1-BFYR35ZXTOF36/z6ngrY69/nX+o="
     },
     "blueimp-tmpl": {
       "version": "2.5.7",
@@ -3125,6 +3138,12 @@
           "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.2.0.tgz",
           "integrity": "sha1-8rslNovBIeORwlIN6Slpyu4KApA=",
           "dev": true
+        },
+        "tapable": {
+          "version": "0.1.10",
+          "resolved": "https://registry.npmjs.org/tapable/-/tapable-0.1.10.tgz",
+          "integrity": "sha1-KcNXB8K3DlDQdIK10gLo7URtr9Q=",
+          "dev": true
         }
       }
     },
@@ -3292,6 +3311,12 @@
           "integrity": "sha1-W28VR/TRAuZw4UDFCb5ncdautUk=",
           "dev": true
         },
+        "estraverse": {
+          "version": "1.5.1",
+          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-1.5.1.tgz",
+          "integrity": "sha1-hno+jlip+EYYr7bC3bzZFrfLr3E=",
+          "dev": true
+        },
         "esutils": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/esutils/-/esutils-1.0.0.tgz",
@@ -3376,6 +3401,12 @@
           "resolved": "https://registry.npmjs.org/espree/-/espree-2.2.5.tgz",
           "integrity": "sha1-32kbkxCIlAKuspzAZnCMVmkLhUs=",
           "dev": true
+        },
+        "estraverse": {
+          "version": "1.5.1",
+          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-1.5.1.tgz",
+          "integrity": "sha1-hno+jlip+EYYr7bC3bzZFrfLr3E=",
+          "dev": true
         }
       }
     },
@@ -3415,10 +3446,9 @@
       }
     },
     "estraverse": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-1.5.1.tgz",
-      "integrity": "sha1-hno+jlip+EYYr7bC3bzZFrfLr3E=",
-      "dev": true
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.1.0.tgz",
+      "integrity": "sha1-QPI6dgkgQb5kZ9fyNckztnB2bgU="
     },
     "estraverse-fb": {
       "version": "1.3.2",
@@ -4360,6 +4390,11 @@
         "toposort": "1.0.3"
       },
       "dependencies": {
+        "bluebird": {
+          "version": "3.5.0",
+          "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.0.tgz",
+          "integrity": "sha1-eRQg1/VR7qKJdFOop3ZT+WYG1nw="
+        },
         "camel-case": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-3.0.0.tgz",
@@ -5348,6 +5383,14 @@
         "socket.io": "1.7.4",
         "source-map": "0.4.4",
         "useragent": "2.2.1"
+      },
+      "dependencies": {
+        "bluebird": {
+          "version": "3.5.0",
+          "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.0.tgz",
+          "integrity": "sha1-eRQg1/VR7qKJdFOop3ZT+WYG1nw=",
+          "dev": true
+        }
       }
     },
     "karma-chai": {
@@ -6070,9 +6113,9 @@
       }
     },
     "moment": {
-      "version": "2.18.1",
-      "resolved": "https://registry.npmjs.org/moment/-/moment-2.18.1.tgz",
-      "integrity": "sha1-w2GT3Tzhwu7SrbfIAtu8d6gbHA8="
+      "version": "2.29.2",
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.2.tgz",
+      "integrity": "sha512-UgzG4rvxYpN15jgCmVJwac49h9ly9NurikMWGPdVxm8GZD6XjkKPxDTjQQ43gtGgnV3X0cAyWDdP2Wexoquifg=="
     },
     "moment-timezone": {
       "version": "0.5.13",
@@ -6080,6 +6123,13 @@
       "integrity": "sha1-mc5cfYJyYusPH3AgRBd/YHRde5A=",
       "requires": {
         "moment": "2.18.1"
+      },
+      "dependencies": {
+        "moment": {
+          "version": "2.18.1",
+          "resolved": "https://registry.npmjs.org/moment/-/moment-2.18.1.tgz",
+          "integrity": "sha1-w2GT3Tzhwu7SrbfIAtu8d6gbHA8="
+        }
       }
     },
     "ms": {
@@ -8040,6 +8090,13 @@
       "integrity": "sha512-0dQJNs0aaiMeGp1AJACDTzGMM7N4qv4Wgg1948/ARdLt3VKlkcem6Yjm5ExUmUtoXk6WpSXvFQ204l7E+RTEEQ==",
       "requires": {
         "moment": "2.18.1"
+      },
+      "dependencies": {
+        "moment": {
+          "version": "2.18.1",
+          "resolved": "https://registry.npmjs.org/moment/-/moment-2.18.1.tgz",
+          "integrity": "sha1-w2GT3Tzhwu7SrbfIAtu8d6gbHA8="
+        }
       }
     },
     "react-onclickoutside": {
@@ -9466,10 +9523,9 @@
       "integrity": "sha1-Kb9hXUqnEhvdiYsi1LP5vE4qoD0="
     },
     "tapable": {
-      "version": "0.1.10",
-      "resolved": "https://registry.npmjs.org/tapable/-/tapable-0.1.10.tgz",
-      "integrity": "sha1-KcNXB8K3DlDQdIK10gLo7URtr9Q=",
-      "dev": true
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/tapable/-/tapable-1.0.0.tgz",
+      "integrity": "sha512-dQRhbNQkRnaqauC7WqSJ21EEksgT0fYZX2lqXzGkpo8JNig9zGZTYoMGvyI2nWmXlE2VSVXVDu7wLVGu/mQEsg=="
     },
     "tar": {
       "version": "2.2.1",
@@ -9484,6 +9540,7 @@
     },
     "tc-accounts": {
       "version": "git+https://github.com/appirio-tech/accounts-app.git#fb214bc1d9fe889ae27d47e51526db226822991c",
+      "from": "git+https://github.com/appirio-tech/accounts-app.git#fb214bc1d9fe889ae27d47e51526db226822991c",
       "requires": {
         "angucomplete-alt": "2.5.0",
         "angular": "1.6.5",
@@ -9555,6 +9612,11 @@
             }
           }
         },
+        "moment": {
+          "version": "2.18.1",
+          "resolved": "https://registry.npmjs.org/moment/-/moment-2.18.1.tgz",
+          "integrity": "sha1-w2GT3Tzhwu7SrbfIAtu8d6gbHA8="
+        },
         "react-router": {
           "version": "2.8.1",
           "resolved": "https://registry.npmjs.org/react-router/-/react-router-2.8.1.tgz",
@@ -9691,6 +9753,7 @@
     },
     "topcoder-app-r": {
       "version": "git+https://github.com/appirio-tech/topcoder-app-r.git#d74851b03d031bb4a427626033eee2436e5915f8",
+      "from": "git+https://github.com/appirio-tech/topcoder-app-r.git#d74851b03d031bb4a427626033eee2436e5915f8",
       "requires": {
         "appirio-styles": "0.0.30",
         "classnames": "2.2.5",
@@ -9709,6 +9772,11 @@
         "tc-ui": "1.0.12"
       },
       "dependencies": {
+        "moment": {
+          "version": "2.18.1",
+          "resolved": "https://registry.npmjs.org/moment/-/moment-2.18.1.tgz",
+          "integrity": "sha1-w2GT3Tzhwu7SrbfIAtu8d6gbHA8="
+        },
         "react-router": {
           "version": "2.8.1",
           "resolved": "https://registry.npmjs.org/react-router/-/react-router-2.8.1.tgz",
@@ -10223,6 +10291,12 @@
             "has-flag": "1.0.0"
           }
         },
+        "tapable": {
+          "version": "0.1.10",
+          "resolved": "https://registry.npmjs.org/tapable/-/tapable-0.1.10.tgz",
+          "integrity": "sha1-KcNXB8K3DlDQdIK10gLo7URtr9Q=",
+          "dev": true
+        },
         "uglify-js": {
           "version": "2.7.5",
           "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.7.5.tgz",
diff --git a/package-lock.json b/package-lock.json
index 44daf5a86..fbe28724f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -137,7 +137,8 @@
       "integrity": "sha1-HAPA8PaBvJRYcoaMPbLthLvCFXE="
     },
     "angular-intro.js": {
-      "version": "github:appirio-tech/angular-intro.js#81610d6c3f03437d5cc38211482d43385e2d7be9"
+      "version": "github:appirio-tech/angular-intro.js#81610d6c3f03437d5cc38211482d43385e2d7be9",
+      "from": "github:appirio-tech/angular-intro.js#81610d6c3f03437d5cc38211482d43385e2d7be9"
     },
     "angular-jwt": {
       "version": "0.0.9",
@@ -271,6 +272,11 @@
             "lodash": "3.10.1"
           },
           "dependencies": {
+            "bluebird": {
+              "version": "3.5.0",
+              "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.0.tgz",
+              "integrity": "sha1-eRQg1/VR7qKJdFOop3ZT+WYG1nw="
+            },
             "lodash": {
               "version": "3.10.1",
               "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz",
@@ -378,6 +384,7 @@
     },
     "appirio-tech-react-components": {
       "version": "github:appirio-tech/react-components#25a102b55c1769fe2b42a222d37359f09dc24763",
+      "from": "github:appirio-tech/react-components#25a102b55c1769fe2b42a222d37359f09dc24763",
       "requires": {
         "appirio-styles": "0.0.26",
         "appirio-tech-api-schemas": "5.0.70",
@@ -412,6 +419,11 @@
             "node-neat": "1.7.2"
           }
         },
+        "moment": {
+          "version": "2.18.1",
+          "resolved": "https://registry.npmjs.org/moment/-/moment-2.18.1.tgz",
+          "integrity": "sha1-w2GT3Tzhwu7SrbfIAtu8d6gbHA8="
+        },
         "react-input-autosize": {
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/react-input-autosize/-/react-input-autosize-2.0.1.tgz",
@@ -656,7 +668,8 @@
       },
       "dependencies": {
         "qs": {
-          "version": "git+https://github.com/jfromaniello/node-querystring.git#5d96513991635e3e22d7aa54a8584d6ce97cace8"
+          "version": "git+https://github.com/jfromaniello/node-querystring.git#5d96513991635e3e22d7aa54a8584d6ce97cace8",
+          "from": "git+https://github.com/jfromaniello/node-querystring.git#5d96513991635e3e22d7aa54a8584d6ce97cace8"
         }
       }
     },
@@ -1696,9 +1709,9 @@
       }
     },
     "bluebird": {
-      "version": "3.5.0",
-      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.0.tgz",
-      "integrity": "sha1-eRQg1/VR7qKJdFOop3ZT+WYG1nw="
+      "version": "2.9.2",
+      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-2.9.2.tgz",
+      "integrity": "sha1-BFYR35ZXTOF36/z6ngrY69/nX+o="
     },
     "blueimp-tmpl": {
       "version": "2.5.7",
@@ -3126,6 +3139,12 @@
           "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.2.0.tgz",
           "integrity": "sha1-8rslNovBIeORwlIN6Slpyu4KApA=",
           "dev": true
+        },
+        "tapable": {
+          "version": "0.1.10",
+          "resolved": "https://registry.npmjs.org/tapable/-/tapable-0.1.10.tgz",
+          "integrity": "sha1-KcNXB8K3DlDQdIK10gLo7URtr9Q=",
+          "dev": true
         }
       }
     },
@@ -3293,6 +3312,12 @@
           "integrity": "sha1-W28VR/TRAuZw4UDFCb5ncdautUk=",
           "dev": true
         },
+        "estraverse": {
+          "version": "1.5.1",
+          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-1.5.1.tgz",
+          "integrity": "sha1-hno+jlip+EYYr7bC3bzZFrfLr3E=",
+          "dev": true
+        },
         "esutils": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/esutils/-/esutils-1.0.0.tgz",
@@ -3462,10 +3487,9 @@
       }
     },
     "estraverse": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-1.5.1.tgz",
-      "integrity": "sha1-hno+jlip+EYYr7bC3bzZFrfLr3E=",
-      "dev": true
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.1.0.tgz",
+      "integrity": "sha1-QPI6dgkgQb5kZ9fyNckztnB2bgU="
     },
     "estraverse-fb": {
       "version": "1.3.2",
@@ -4392,6 +4416,11 @@
         "toposort": "1.0.3"
       },
       "dependencies": {
+        "bluebird": {
+          "version": "3.5.0",
+          "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.0.tgz",
+          "integrity": "sha1-eRQg1/VR7qKJdFOop3ZT+WYG1nw="
+        },
         "camel-case": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-3.0.0.tgz",
@@ -6311,9 +6340,9 @@
       }
     },
     "moment": {
-      "version": "2.18.1",
-      "resolved": "https://registry.npmjs.org/moment/-/moment-2.18.1.tgz",
-      "integrity": "sha1-w2GT3Tzhwu7SrbfIAtu8d6gbHA8="
+      "version": "2.29.2",
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.2.tgz",
+      "integrity": "sha512-UgzG4rvxYpN15jgCmVJwac49h9ly9NurikMWGPdVxm8GZD6XjkKPxDTjQQ43gtGgnV3X0cAyWDdP2Wexoquifg=="
     },
     "moment-timezone": {
       "version": "0.5.13",
@@ -6321,6 +6350,13 @@
       "integrity": "sha1-mc5cfYJyYusPH3AgRBd/YHRde5A=",
       "requires": {
         "moment": "2.18.1"
+      },
+      "dependencies": {
+        "moment": {
+          "version": "2.18.1",
+          "resolved": "https://registry.npmjs.org/moment/-/moment-2.18.1.tgz",
+          "integrity": "sha1-w2GT3Tzhwu7SrbfIAtu8d6gbHA8="
+        }
       }
     },
     "ms": {
@@ -8207,6 +8243,13 @@
       "integrity": "sha512-0dQJNs0aaiMeGp1AJACDTzGMM7N4qv4Wgg1948/ARdLt3VKlkcem6Yjm5ExUmUtoXk6WpSXvFQ204l7E+RTEEQ==",
       "requires": {
         "moment": "2.18.1"
+      },
+      "dependencies": {
+        "moment": {
+          "version": "2.18.1",
+          "resolved": "https://registry.npmjs.org/moment/-/moment-2.18.1.tgz",
+          "integrity": "sha1-w2GT3Tzhwu7SrbfIAtu8d6gbHA8="
+        }
       }
     },
     "react-onclickoutside": {
@@ -9641,10 +9684,9 @@
       "integrity": "sha1-Kb9hXUqnEhvdiYsi1LP5vE4qoD0="
     },
     "tapable": {
-      "version": "0.1.10",
-      "resolved": "https://registry.npmjs.org/tapable/-/tapable-0.1.10.tgz",
-      "integrity": "sha1-KcNXB8K3DlDQdIK10gLo7URtr9Q=",
-      "dev": true
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/tapable/-/tapable-1.0.0.tgz",
+      "integrity": "sha512-dQRhbNQkRnaqauC7WqSJ21EEksgT0fYZX2lqXzGkpo8JNig9zGZTYoMGvyI2nWmXlE2VSVXVDu7wLVGu/mQEsg=="
     },
     "tar": {
       "version": "2.2.1",
@@ -9659,6 +9701,7 @@
     },
     "tc-accounts": {
       "version": "git+https://github.com/appirio-tech/accounts-app.git#fb214bc1d9fe889ae27d47e51526db226822991c",
+      "from": "git+https://github.com/appirio-tech/accounts-app.git#fb214bc1d9fe889ae27d47e51526db226822991c",
       "requires": {
         "angucomplete-alt": "2.5.0",
         "angular": "1.6.5",
@@ -9730,6 +9773,11 @@
             }
           }
         },
+        "moment": {
+          "version": "2.18.1",
+          "resolved": "https://registry.npmjs.org/moment/-/moment-2.18.1.tgz",
+          "integrity": "sha1-w2GT3Tzhwu7SrbfIAtu8d6gbHA8="
+        },
         "react-router": {
           "version": "2.8.1",
           "resolved": "https://registry.npmjs.org/react-router/-/react-router-2.8.1.tgz",
@@ -9871,6 +9919,7 @@
     },
     "topcoder-app-r": {
       "version": "git+https://github.com/appirio-tech/topcoder-app-r.git#d74851b03d031bb4a427626033eee2436e5915f8",
+      "from": "git+https://github.com/appirio-tech/topcoder-app-r.git#d74851b03d031bb4a427626033eee2436e5915f8",
       "requires": {
         "appirio-styles": "0.0.30",
         "classnames": "2.2.5",
@@ -9889,6 +9938,11 @@
         "tc-ui": "1.0.12"
       },
       "dependencies": {
+        "moment": {
+          "version": "2.18.1",
+          "resolved": "https://registry.npmjs.org/moment/-/moment-2.18.1.tgz",
+          "integrity": "sha1-w2GT3Tzhwu7SrbfIAtu8d6gbHA8="
+        },
         "react-router": {
           "version": "2.8.1",
           "resolved": "https://registry.npmjs.org/react-router/-/react-router-2.8.1.tgz",
@@ -10411,6 +10465,12 @@
             "has-flag": "1.0.0"
           }
         },
+        "tapable": {
+          "version": "0.1.10",
+          "resolved": "https://registry.npmjs.org/tapable/-/tapable-0.1.10.tgz",
+          "integrity": "sha1-KcNXB8K3DlDQdIK10gLo7URtr9Q=",
+          "dev": true
+        },
         "uglify-js": {
           "version": "2.7.5",
           "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.7.5.tgz",
diff --git a/package.json b/package.json
index 7ff167e7b..9db94b103 100644
--- a/package.json
+++ b/package.json
@@ -66,7 +66,7 @@
     "intro.js": "1.1.1",
     "jstimezonedetect": "1.0.6",
     "lodash": "4.17.4",
-    "moment": "2.18.1",
+    "moment": "2.29.2",
     "moment-timezone": "0.5.13",
     "ng-dialog": "0.5.9",
     "react-select": "1.0.0-beta8",