Pull in changes to Community Version

Pull in changes from CCL to community version.