New policy and context files

Pull request for issue #1212