Bugzilla/1062819 pickup rebased/mobile connection core

let's not forget this one while squashing :)