This is already done automatically in the LSS data, but this should be made optional and offered for imaging as well.