Merged back fez-specific dependencies