diff --git a/.circleci/config.yml b/.circleci/config.yml
index 5f3651b66c..c8c19b8760 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -182,7 +182,6 @@ workflows:
             branches:
               only:
                 - develop
-                - ga-hotfix
       # This is beta env for production soft releases
       - "build-prod-beta":
           context : org-global
@@ -190,7 +189,6 @@ workflows:
             branches:
               only:
                 - develop
-                - ga-hotfix
       # Production builds are exectuted 
       # when PR is merged to the master
       # Don't change anything in this configuration
diff --git a/package.json b/package.json
index 723ebb90cd..f575c2c4d2 100644
--- a/package.json
+++ b/package.json
@@ -82,7 +82,7 @@
     "moment-timezone": "^0.5.21",
     "money": "^0.2.0",
     "morgan": "^1.9.0",
-    "navigation-component": "topcoder-platform/navigation-component#ga-hotfix",
+    "navigation-component": "topcoder-platform/navigation-component#develop",
     "node-forge": "^0.7.5",
     "nuka-carousel": "^4.5.3",
     "postcss": "^6.0.23",
@@ -134,7 +134,7 @@
     "tc-accounts": "git+https://github.com/appirio-tech/accounts-app.git#dev",
     "tc-core-library-js": "github:appirio-tech/tc-core-library-js#v2.6.3",
     "tc-ui": "^1.0.12",
-    "topcoder-react-lib": "v0.17.0",
+    "topcoder-react-lib": "v0.17.1",
     "topcoder-react-ui-kit": "^1.0.11",
     "topcoder-react-utils": "0.7.8",
     "turndown": "^4.0.2",
diff --git a/src/shared/components/Notifications/TabsPanel/index.jsx b/src/shared/components/Notifications/TabsPanel/index.jsx
index 13d72e384f..6bb6f1d820 100644
--- a/src/shared/components/Notifications/TabsPanel/index.jsx
+++ b/src/shared/components/Notifications/TabsPanel/index.jsx
@@ -1,7 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import cn from 'classnames';
-import { tracking } from 'topcoder-react-lib';
 import styles from './style.scss';
 
 
@@ -21,7 +20,7 @@ export default class TabsPanel extends React.Component {
 
 
   render() {
-    const { changeTab } = this.props;
+    const { changeTab, tracking } = this.props;
     const { tab } = this.state;
     return (
       <div className={styles.container}>
@@ -106,4 +105,5 @@ export default class TabsPanel extends React.Component {
 
 TabsPanel.propTypes = {
   changeTab: PropTypes.func.isRequired,
+  tracking: PropTypes.shape().isRequired,
 };
diff --git a/src/shared/components/Notifications/index.jsx b/src/shared/components/Notifications/index.jsx
index c263e559f2..f2f4dc03ae 100644
--- a/src/shared/components/Notifications/index.jsx
+++ b/src/shared/components/Notifications/index.jsx
@@ -184,6 +184,7 @@ export default class NotificationList extends React.Component {
         <div className={styles['notifications-panel']}>
           <TabsPanel
             changeTab={tab => this.setState({ activeTab: tab })}
+            tracking={tracking}
           />
           <div className={styles['noti-body']}>
             <Fragment key="nonComplete">