Bug 907951 - [System] replace forward images of wrapper