Initial check-in for Clarifications port and its basic test