Revert "Revert "CR-21 - Refining developer model parameters""

This reverts commit b364d42ecf17e5fb1902217e5f930081afbcdb5b.