Merge "Close VID's plain text port 30238" into staging