Merge "Fix to allow self-updates without user action." into sc-dev