Report snapshot image status upstream
Various API cleanup