Merge "Modify third party proxy to test the SUBMIT"