[FIX Test fixed
Merge branch 'stable'