Fix lost prepopulation

#5326 

* update OG and ER-prepopualte to update version
* Patch ER-prepopulate with a fix