Merge "Add max disable duration to "disconnect" feature" into sc-dev