Fix script error bug in shape tests.
Merge remote-tracking branch 'upstream/dev-master' into dev-master