Added test
Synced from master
Synced from master