diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index dc1a061..091a388 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -3,7 +3,7 @@
 
 #### Where should the reviewer start?
 
-#### How can this be manually tested? (brief repro steps)
+#### How can this be manually tested? (brief repro steps and corpnet-URL with change)
 
 #### What are the relevant TFS items? (list id numbers)
 
@@ -12,18 +12,11 @@
 - [ ] Add pull request hyperlink to relevant TFS items
 - [ ] For large or complex change: schedule an in-person review session
 - [ ] This change has appropriate test coverage
+- [ ] Get at least two approvals
 
-#### Reminders BEFORE merging
-1. Get at least two approvals
-1. If you're merging from a feature branch into the development branch then "flatten" or "squash" commits
-1. If merging from the development branch into master (or porting changes from upstream) then use github's UI to get review feedback, but use the git command line interface to complete the actual merge.
-
-#### Reminders AFTER merging
-1. Delete the remote feature branch
-1. Resolve relevant TFS items
-1. (reverse merge) If you merged from the development branch into master then check to see if there are any changes in master that can be merged down to the development branch (like hotfixes, etc). In this case, use github's UI for feedback and the git command line interface for the actual merge.
-
-[//]: # ( todo: If you merged into development branch then verify change in our "rolling deployment" environment. Then notify stakeholders interested in or involved with the change )
+#### Reminders DURING merge
+1. If you're merging from a short-term (feature) branch into a long-term branch (like dev, release, or master) then "Squash and merge" to keep our history clean.
+1. If merging from two longterm branches (like cherry picks from upstream, dev to release, etc) then "Create merge commit" to preserve individual commits.
 
 [//]: # ( fyi: This content was heavily inspired by )
 [//]: # ( 1 Our team's policies and processes )
diff --git a/comprehensive/lms/static/cookieBanner.js b/comprehensive/lms/static/cookieBanner.js
index a242ccc..60fe205 100644
--- a/comprehensive/lms/static/cookieBanner.js
+++ b/comprehensive/lms/static/cookieBanner.js
@@ -134,19 +134,23 @@ $(document).ready(function () {
             // by default hide the banner ux
             document.getElementById("cookie-markup").style.display = "none";
 
+
             // add css links
-            var css_link = document.createElement("link");
-            css_link.href = cookieNotice.Css;
-            css_link.rel = "stylesheet";
-            css_link.type = "text/css";
-            $("head").append(css_link);
+            var cssLink = document.createElement("link");
+            cssLink.href = cookieNotice.Css;
+            cssLink.rel = "stylesheet";
+            cssLink.type = "text/css";
+            $("head").append(cssLink);
 
             // add js
             cookieNotice.LoadJSCookieAPI(cookieNotice.Js).done(function () {
-                if (mscc && mscc.hasConsent()) {
-                    // Add non-essiential cookies
-                    cookieNotice.addBICookies();
-                } else if (mscc) {
+                if (mscc) {
+                    consentData = mscc.getConsentData();
+                    // check if consent is given & valid or we need to consent
+                    if(consentData != null && consentData.hasConsent && consentData.consentDate != null && consentData.consentDate.getTime() >= cookieNotice.MinimumConsentDate){
+                        cookieNotice.addBICookies();
+                        return;
+                    }
                     document.getElementById("cookie-markup").style.display = "block";
                     document.getElementById("msccBanner").style.display = "block";
                     mscc.on('consent', cookieNotice.addBICookies);
diff --git a/comprehensive/lms/templates/login.html b/comprehensive/lms/templates/login.html
index d440e2f..53f9ad7 100644
--- a/comprehensive/lms/templates/login.html
+++ b/comprehensive/lms/templates/login.html
@@ -191,7 +191,7 @@ from third_party_auth import provider, pipeline
           </li>
           <li class="field required password" id="field-password">
             <label for="password">${_('Password')}</label>
-            <input id="password" type="password" name="password" value="" required aria-required="true" />
+            <input id="password" type="password" name="password" value="" autocomplete="off" required aria-required="true" />
             <span class="tip tip-input">
               <a href="#forgot-password-modal" rel="leanModal" class="pwd-reset action action-forgotpw" id="forgot-password-link" role="button" aria-haspopup="true">${_('Forgot password?')}</a>
             </span>
diff --git a/comprehensive/lms/templates/register-form.html b/comprehensive/lms/templates/register-form.html
index fd69cf7..d0b0800 100644
--- a/comprehensive/lms/templates/register-form.html
+++ b/comprehensive/lms/templates/register-form.html
@@ -95,7 +95,7 @@ from student.models import UserProfile
 
     <li class="is-disabled field optional password" id="field-password" hidden>
 	  <label for="password">${_('Password')}</label>
-      <input id="password" type="password" name="password" value="" disabled required aria-required="true" aria-describedby="password-tip"/>
+      <input id="password" type="password" name="password" value="" autocomplete="off" disabled required aria-required="true" aria-describedby="password-tip"/>
       <span class="tip tip-input" id="password-tip">${_('Must be at least 8 characters. Must contain at least one lowercase, one uppercase, and one symbol character.')}</span>
     </li>
 
@@ -103,7 +103,7 @@ from student.models import UserProfile
 
     <li class="field required password" id="field-password">	  
 	  <label for="password">${_('Password')}</label>
-      <input id="password" type="password" name="password" value="" required aria-required="true" aria-describedby="password-tip"/>
+      <input id="password" type="password" name="password" value="" autocomplete="off" required aria-required="true" aria-describedby="password-tip"/>
       <span class="tip tip-input" style="position:static" id="password-tip">${_('Must be at least 8 characters. Must contain at least one lowercase, one uppercase, and one symbol character.')}</span>
     </li>
 
diff --git a/courses/lms/static/images/download_video.png b/courses/lms/static/images/download_video.png
index 52dcf66..8b26cea 100644
Binary files a/courses/lms/static/images/download_video.png and b/courses/lms/static/images/download_video.png differ
diff --git a/courses/lms/static/images/infopedia_courses.png b/courses/lms/static/images/infopedia_courses.png
index 7ae3796..54f4519 100644
Binary files a/courses/lms/static/images/infopedia_courses.png and b/courses/lms/static/images/infopedia_courses.png differ
diff --git a/courses/lms/templates/login.html b/courses/lms/templates/login.html
index 12df452..0658b40 100644
--- a/courses/lms/templates/login.html
+++ b/courses/lms/templates/login.html
@@ -211,7 +211,7 @@ from third_party_auth import provider, pipeline
           </li>
           <li class="field required password" id="field-password">
             <label for="password">${_('Password')}</label>
-            <input id="password" type="password" name="password" value="" required aria-required="true" />
+            <input id="password" type="password" name="password" value="" autocomplete="off" required aria-required="true" />
             <span class="tip tip-input">
               <a href="#forgot-password-modal" rel="leanModal" class="pwd-reset action action-forgotpw" id="forgot-password-link" role="button" aria-haspopup="true">${_('Forgot password?')}</a>
             </span>
diff --git a/courses/lms/templates/register-form.html b/courses/lms/templates/register-form.html
index bfe19f3..00b2c67 100644
--- a/courses/lms/templates/register-form.html
+++ b/courses/lms/templates/register-form.html
@@ -95,7 +95,7 @@ from student.models import UserProfile
 
     <li class="is-disabled field optional password" id="field-password" hidden>
 	  <label for="password">${_('Password')}</label>
-      <input id="password" type="password" name="password" value="" disabled required aria-required="true" aria-describedby="password-tip"/>
+      <input id="password" type="password" name="password" value="" autocomplete="off" disabled required aria-required="true" aria-describedby="password-tip"/>
       <span class="tip tip-input" id="password-tip">${_('Must be at least 8 characters. Must contain at least one lowercase, one uppercase, and one symbol character.')}</span>
     </li>
 
@@ -103,7 +103,7 @@ from student.models import UserProfile
 
     <li class="field required password" id="field-password">	  
 	  <label for="password">${_('Password')}</label>
-      <input id="password" type="password" name="password" value="" required aria-required="true" aria-describedby="password-tip"/>
+      <input id="password" type="password" name="password" value="" autocomplete="off" required aria-required="true" aria-describedby="password-tip"/>
       <span class="tip tip-input" style="position:static" id="password-tip">${_('Must be at least 8 characters. Must contain at least one lowercase, one uppercase, and one symbol character.')}</span>
     </li>