CONTRIB-4411 First implementation skel