merge dev (DFImageProvider)