Merge branch 'tg/next__scripts_version_as_ini' into next