#287 Reproduce the issue
#287 Fix the issue
#287 Make IT pass
Merge remote-tracking branch 'upstream/master' into 287
#287 Fix IT ones again