lock Connexion

origin/device-merge - 20ad4a40c786852ea9c85e98a1314a1af5d4479b