Revert "Revert "Image exchange""

This reverts commit 455484976b41dfc678313684fae84709def94657.