Merge "Refactor script.cpp" into devel/master