Merge branch 'scripts_refactoring'