Merge "Force creation of Socket upon Transform application" into pi-dev