Merge "Add an images client."