Adding option to fail gracefuly if there's not enough resources
Merge remote-tracking branch 'origin/master' into 2-0-stable