PMO-2394: financial risk implemented as originally intended
PMO-2388: properties renamed