Demote RiskyAttribute and promote Risk [story:44569549]