Merge "Refactoring build system to support Fuel 6.1"