de859676dd
Remove double counting of decay. Limit maximum KF boost. Change-Id: I0fb2344d0f78b5e95bb899dfad12b0ca84034b2c