Bugzilla/1062819 pickup rebased/mobile connection core

not sure it's worth the indirection