Merge "Fix maximum time to lock" into sc-dev