Merge "Split property and file contexts modules"