[-] Core: Fix #PSCFV-9986, Moved stock assignement to Controller