merge support for custom get_peeled function in server.