Merge pull request 'file-notebook-new' (#3474) from file-notebook-new into V20221228