Tests for 571, 573, 574
Merge remote-tracking branch 'origin/master'