Change default size of bfebs image #hack
Merge remote-tracking branch 'origin/testing' into testing