Merge branch 'noslicemgr' into geni-v3