Merge branch 'nd/init-restore-env'