by Benjamin. Fix eProposal_CFF_Master update bugs.