Fix test problem
Merge origin/master