API consumption continues: bad-state
Merge remote-tracking branch 'origin/master'