Merge "Revert "Update dirty-image-objects file"" into main