Integrate fluid dev changes