checkpoint for xap-gateway
bug fixes