Fix comment
Add test case for 10154
Implement 10154