Merge "Update on shortcut changes and statuses cleared" into sc-dev