Merge "Add extra preloads to image"