Merge branch 't/pre_scripts'