Merged, trying to fix E200_load_images issue.