fixes #7535 load sample script api fix
Merge branch 'dev' into test