Merge pull request #2200 from ojii/develop

two test fixes
Merge remote-tracking branch 'origin/develop' into develop
Merge branch 'develop' into tests-cleanup