Merge "1/ Initial preparation for separate shell main thread"