diff --git a/README.md b/README.md
index 9e8d61105..0465f8016 100755
--- a/README.md
+++ b/README.md
@@ -147,7 +147,7 @@ https://www.youtube.com/watch?v=dJrykKQGDcs
 
 ## Changelog ##
 
-### 4.6.1 [April 8, 2020] ###
+### 4.6.1 [April 9, 2020] ###
 
 * Enhancement
 	* Disable the terms of service checkbox when the activity is published
diff --git a/app/assets/js/rtm-upload-terms.js b/app/assets/js/rtm-upload-terms.js
index 845a8129a..e4b6e942c 100755
--- a/app/assets/js/rtm-upload-terms.js
+++ b/app/assets/js/rtm-upload-terms.js
@@ -15,10 +15,14 @@ if ( 'object' === typeof rtMediaHook ) {
      * @return {boolean}
      */
     rtMediaHook.register( 'rtmedia_js_before_upload', function ( args ) {
-        if ( false === args || 'undefined' === typeof args.uploader.settings.multipart_params || 'undefined' === typeof args.src ) {
+        if ( ! args ) {
             return args;
         }
 
+        if ( 'undefined' === typeof args.uploader || 'undefined' === typeof args.uploader.settings || 'undefined' === typeof args.uploader.settings.multipart_params || 'undefined' === typeof args.src ) {
+            return ( 'boolean' === typeof args ? args : true );
+        }
+
         var multipart_params = args.uploader.settings.multipart_params;
         var request_key = false;
         var terms_key = false;
@@ -72,7 +76,7 @@ if ( 'object' === typeof rtMediaHook ) {
      * @return {boolean}
      */
     rtMediaHook.register( 'rtmedia_js_upload_file', function ( args ) {
-        if ( false === args ) {
+        if ( ! args ) {
             return args;
         }
 
@@ -120,7 +124,7 @@ if ( 'object' === typeof rtMediaHook ) {
         }
 
         if ( ! isTermsEnabled ) {
-            return args;
+            return ( 'boolean' === typeof args ? args : true );
         }
 
         if ( 0 === terms.length ) {
diff --git a/app/assets/js/rtm-upload-terms.min.js b/app/assets/js/rtm-upload-terms.min.js
index 19e1c71ee..c95f5c04c 100644
--- a/app/assets/js/rtm-upload-terms.min.js
+++ b/app/assets/js/rtm-upload-terms.min.js
@@ -3,4 +3,4 @@
  * @package rtMedia 
  */
 
-var rtmediaTermsConditionsElement;function rtp_display_terms_warning(e,t){if(0===jQuery(".rt_alert_msg").length){var r=jQuery("<span />").attr("style","color:red; display:block; clear:both;").addClass("rt_alert_msg").empty().append(t);e.after(r)}}function handle_privacy_message(){jQuery("#close_rtm_privacy_message").on("click",function(){var e=jQuery(".privacy_message_wrapper");e.fadeOut("slow",function(){e.remove(),jQuery.cookie("rtm_show_privacy_message","view",{expires:1,path:"/"})})})}"object"==typeof rtMediaHook&&(rtMediaHook.register("rtmedia_js_before_upload",function(e){if(!1===e||void 0===e.uploader.settings.multipart_params||void 0===e.src)return e;var t=e.uploader.settings.multipart_params,r=!1,a=!1,d=!1;if("activity"===e.src?(r="activity_terms_condition_request",a="activity_terms_condition","true"===rtmedia_upload_terms_data.activity_terms_enabled&&(d=!0)):"uploader"===e.src&&(r="uploader_terms_condition_request",a="uploader_terms_condition","true"===rtmedia_upload_terms_data.uploader_terms_enabled&&(d=!0)),!d)return!0;if(r&&a&&d)if(t[r]="true",rtmediaTermsConditionsElement&&0<rtmediaTermsConditionsElement.length)t[a]=rtmediaTermsConditionsElement.prop("checked")?"true":"false";else{var i=$("#rtmedia_upload_terms_conditions");0<i.length&&(rtmediaTermsConditionsElement=i,t[a]=i.prop("checked")?"true":"false")}return e.uploader.settings.multipart_params=t,!0}),rtMediaHook.register("rtmedia_js_upload_file",function(e){if(!1===e)return e;var t=!1;!1!==e&&void 0!==e.src&&(t=e.src);var r=!1,a=!1,d=jQuery("#rtmedia_upload_terms_conditions");return"uploader"===t?(r=0===d.length?jQuery("#drag-drop-area"):d.parent(".rtmedia-upload-terms"),("undefined"!=typeof rtmedia_upload_terms_data&&void 0===rtmedia_upload_terms_data.uploader_terms_enabled||"true"===rtmedia_upload_terms_data.uploader_terms_enabled)&&(a=!0)):"activity"===t?(r=0===d.length?jQuery("#whats-new-options"):d.parent(".rtmedia-upload-terms"),"true"===rtmedia_upload_terms_data.activity_terms_enabled&&(a=!0)):jQuery("#drag-drop-area").length&&(r=0===d.length?jQuery("#drag-drop-area"):d.parent(".rtmedia-upload-terms"),("undefined"!=typeof rtmedia_upload_terms_data&&void 0===rtmedia_upload_terms_data.uploader_terms_enabled||"true"===rtmedia_upload_terms_data.uploader_terms_enabled)&&(a=!0)),a?0===d.length?(rtp_display_terms_warning(r,rtmedia_upload_terms_data.message),!1):!!(rtmediaTermsConditionsElement=d).prop("checked")||(rtp_display_terms_warning(r,rtmedia_upload_terms_data.message),!1):e}),rtMediaHook.register("rtmedia_js_before_activity_added",function(e){var t,r,a=jQuery("#aw-whats-new-submit");if(e&&"activity"===e.src){if("false"===rtmedia_upload_terms_data.activity_terms_enabled)return!0;t=(r=jQuery("#whats-new-form")).find("#rtmedia_upload_terms_conditions")}else t=jQuery("#rtmedia_upload_terms_conditions");return 1!==t.length?(rtp_display_terms_warning(r.find("#whats-new-options"),rtmedia_upload_terms_data.message),!1):(t.removeAttr("disabled"),rtmediaTermsConditionsElement=t,!1===e?(a.removeAttr("disabled"),a.removeClass("loading"),e):t.is(":checked")?(t.prop("disabled",!0),!0):(a.removeAttr("disabled"),a.removeClass("loading"),e&&"activity"===e.src?rtp_display_terms_warning(r.find(".rtmedia-upload-terms"),rtmedia_upload_terms_data.message):rtp_display_terms_warning(t.parent(".rtmedia-upload-terms"),rtmedia_upload_terms_data.message),!1))}),rtMediaHook.register("rtmedia_js_after_file_upload",function(){var e=jQuery("#rtmedia-upload-container #rtmedia_upload_terms_conditions");return 1===e.length&&(e.removeAttr("checked"),jQuery(".rt_alert_msg").remove()),!0}),rtMediaHook.register("rtmedia_js_after_activity_added",function(){return jQuery("#rtmedia_upload_terms_conditions").removeAttr("checked").removeAttr("disabled"),!0})),jQuery(document).ready(function(){var a=jQuery("#rtmedia_upload_terms_conditions");jQuery.ajaxPrefilter(function(e,t,r){return void 0===e||void 0===e.data||void 0===t||void 0===t.data||"post_update"===t.data.action&&a.length&&(e.data+="&rtmedia_upload_terms_conditions="+a.prop("checked")),!0}),a.on("click",function(){var e=jQuery(".start-media-upload");if(e.focus(),a.is(":checked")){var t=a.siblings("span.rt_alert_msg");1===t.length?t.remove():a.parent().siblings("span.rt_alert_msg").remove()}else rtp_display_terms_warning(a.parent(".rtmedia-upload-terms"),rtmedia_upload_terms_data.message);if("undefined"!=typeof rtmedia_direct_upload_enabled&&"1"===rtmedia_direct_upload_enabled){var r=jQuery("#aw-whats-new-submit");r.length?""===jQuery("#whats-new").val().trim()&&!jQuery("#rtmedia_uploader_filelist").children("li").length||r.trigger("click"):e.trigger("click")}}),handle_privacy_message()});
\ No newline at end of file
+var rtmediaTermsConditionsElement;function rtp_display_terms_warning(e,t){if(0===jQuery(".rt_alert_msg").length){var r=jQuery("<span />").attr("style","color:red; display:block; clear:both;").addClass("rt_alert_msg").empty().append(t);e.after(r)}}function handle_privacy_message(){jQuery("#close_rtm_privacy_message").on("click",function(){var e=jQuery(".privacy_message_wrapper");e.fadeOut("slow",function(){e.remove(),jQuery.cookie("rtm_show_privacy_message","view",{expires:1,path:"/"})})})}"object"==typeof rtMediaHook&&(rtMediaHook.register("rtmedia_js_before_upload",function(e){if(!e)return e;if(void 0===e.uploader||void 0===e.uploader.settings||void 0===e.uploader.settings.multipart_params||void 0===e.src)return"boolean"!=typeof e||e;var t=e.uploader.settings.multipart_params,r=!1,a=!1,d=!1;if("activity"===e.src?(r="activity_terms_condition_request",a="activity_terms_condition","true"===rtmedia_upload_terms_data.activity_terms_enabled&&(d=!0)):"uploader"===e.src&&(r="uploader_terms_condition_request",a="uploader_terms_condition","true"===rtmedia_upload_terms_data.uploader_terms_enabled&&(d=!0)),!d)return!0;if(r&&a&&d)if(t[r]="true",rtmediaTermsConditionsElement&&0<rtmediaTermsConditionsElement.length)t[a]=rtmediaTermsConditionsElement.prop("checked")?"true":"false";else{var i=$("#rtmedia_upload_terms_conditions");0<i.length&&(rtmediaTermsConditionsElement=i,t[a]=i.prop("checked")?"true":"false")}return e.uploader.settings.multipart_params=t,!0}),rtMediaHook.register("rtmedia_js_upload_file",function(e){if(!e)return e;var t=!1;!1!==e&&void 0!==e.src&&(t=e.src);var r=!1,a=!1,d=jQuery("#rtmedia_upload_terms_conditions");return"uploader"===t?(r=0===d.length?jQuery("#drag-drop-area"):d.parent(".rtmedia-upload-terms"),("undefined"!=typeof rtmedia_upload_terms_data&&void 0===rtmedia_upload_terms_data.uploader_terms_enabled||"true"===rtmedia_upload_terms_data.uploader_terms_enabled)&&(a=!0)):"activity"===t?(r=0===d.length?jQuery("#whats-new-options"):d.parent(".rtmedia-upload-terms"),"true"===rtmedia_upload_terms_data.activity_terms_enabled&&(a=!0)):jQuery("#drag-drop-area").length&&(r=0===d.length?jQuery("#drag-drop-area"):d.parent(".rtmedia-upload-terms"),("undefined"!=typeof rtmedia_upload_terms_data&&void 0===rtmedia_upload_terms_data.uploader_terms_enabled||"true"===rtmedia_upload_terms_data.uploader_terms_enabled)&&(a=!0)),a?0===d.length?(rtp_display_terms_warning(r,rtmedia_upload_terms_data.message),!1):!!(rtmediaTermsConditionsElement=d).prop("checked")||(rtp_display_terms_warning(r,rtmedia_upload_terms_data.message),!1):"boolean"!=typeof e||e}),rtMediaHook.register("rtmedia_js_before_activity_added",function(e){var t,r,a=jQuery("#aw-whats-new-submit");if(e&&"activity"===e.src){if("false"===rtmedia_upload_terms_data.activity_terms_enabled)return!0;t=(r=jQuery("#whats-new-form")).find("#rtmedia_upload_terms_conditions")}else t=jQuery("#rtmedia_upload_terms_conditions");return 1!==t.length?(rtp_display_terms_warning(r.find("#whats-new-options"),rtmedia_upload_terms_data.message),!1):(t.removeAttr("disabled"),rtmediaTermsConditionsElement=t,!1===e?(a.removeAttr("disabled"),a.removeClass("loading"),e):t.is(":checked")?(t.prop("disabled",!0),!0):(a.removeAttr("disabled"),a.removeClass("loading"),e&&"activity"===e.src?rtp_display_terms_warning(r.find(".rtmedia-upload-terms"),rtmedia_upload_terms_data.message):rtp_display_terms_warning(t.parent(".rtmedia-upload-terms"),rtmedia_upload_terms_data.message),!1))}),rtMediaHook.register("rtmedia_js_after_file_upload",function(){var e=jQuery("#rtmedia-upload-container #rtmedia_upload_terms_conditions");return 1===e.length&&(e.removeAttr("checked"),jQuery(".rt_alert_msg").remove()),!0}),rtMediaHook.register("rtmedia_js_after_activity_added",function(){return jQuery("#rtmedia_upload_terms_conditions").removeAttr("checked").removeAttr("disabled"),!0})),jQuery(document).ready(function(){var a=jQuery("#rtmedia_upload_terms_conditions");jQuery.ajaxPrefilter(function(e,t,r){return void 0===e||void 0===e.data||void 0===t||void 0===t.data||"post_update"===t.data.action&&a.length&&(e.data+="&rtmedia_upload_terms_conditions="+a.prop("checked")),!0}),a.on("click",function(){var e=jQuery(".start-media-upload");if(e.focus(),a.is(":checked")){var t=a.siblings("span.rt_alert_msg");1===t.length?t.remove():a.parent().siblings("span.rt_alert_msg").remove()}else rtp_display_terms_warning(a.parent(".rtmedia-upload-terms"),rtmedia_upload_terms_data.message);if("undefined"!=typeof rtmedia_direct_upload_enabled&&"1"===rtmedia_direct_upload_enabled){var r=jQuery("#aw-whats-new-submit");r.length?""===jQuery("#whats-new").val().trim()&&!jQuery("#rtmedia_uploader_filelist").children("li").length||r.trigger("click"):e.trigger("click")}}),handle_privacy_message()});
\ No newline at end of file
diff --git a/bin/.travis.yml b/bin/.travis.yml
index 54b8ec178..59f51c4f2 100644
--- a/bin/.travis.yml
+++ b/bin/.travis.yml
@@ -1,6 +1,6 @@
 dist: xenial
 language: php
-sudo: required
+os: linux
 php:
   - 7.2
 branches:
diff --git a/readme.txt b/readme.txt
index 26af82267..008df579c 100755
--- a/readme.txt
+++ b/readme.txt
@@ -134,7 +134,7 @@ http://www.youtube.com/watch?v=dJrykKQGDcs
 
 == Changelog ==
 
-= 4.6.1 [April 8, 2020] =
+= 4.6.1 [April 9, 2020] =
 
 * Enhancement