Fix merge-profiles call
Populate project-map meta when outside project
// cherry-picked from master