Use the right dataspace when restoring into a LWO.
Merge branch '1.4-stable'