lock Connexion

origin/device-merge - 2b584e4b3fc6274751314d71c269a56bf253992c