Merge "Better enforcement in DocumentsProvider.call()." into klp-dev