Add flag surrenderPenaltyOnPremiumWaiver to define whether a premium waiver already charges the penalty