Add a test
Merge bug25921
stable to default