Merge "Skip back for unknown sources" into sc-dev