Merge "Split query permission from update permission"