Bugzilla/1062819 pickup rebased/mobile connection core

nit: let's remove if not used