Created attachment 378127 evolution patch
And something like this should do it for evolution-data-server.
Created attachment 378127
evolution patch
And something like this should do it for evolution- data-server.