Merge "Fix negative freezer timeout" into sc-dev