Fuel 3.0.1 rhosdev

Add after-merge fixes