Merge "Added images support and existing config support"