changed scrips
(cherry picked from commit 0c7a599)
Merge remote-tracking branch 'origin/develop' into develop3