Merged branch 'develop'.
Fix test counts.