Merge with master
Add demonstrative failing test