Merge "Don't mark odsign as oneshot." into sc-dev