Updated to fuel 1.8/develop branch