Bugzilla/1062819 pickup rebased/mobile connection core

Changed but lemme know what you think in next review.