Fixed for beta 5.
Tweaked test ten for better performance.
Merge remote-tracking branch 'origin/master'