Attach patch with the port plus some other fixes including removal of redunda...