huge commit with new UAT version and risk parity constraints