Merge "Allow File managers to use DATA column" into rvc-qpr-dev