Fixed user script errors.
Merge branch 'test' into dev