Merge "Stronger DocumentsProvider contract." into klp-dev