Merge "Improve output of refreshImageMetadata and refreshFileHeaders"