Merge "Add additional config option "default_image_is_advanced""