mattdrayer/api: Reworked proforma grade algorithm
Merge remote-tracking branch 'origin/release' into solutions-master