Applied Fortify FVDL branch changes