enhancement/479/datasource-info