Basic 1on1 port from 3.1.1

No adaption for 3.7.2 done