Merge "Moving sysproxy to kotlin" into main