Merge branch 'tg/next__redo_version_file' into next