Merge "Change the path of images from pre_config/ to images/"