Merge remote-tracking branch 'teodosia/migrate-contacts-tap' into v1.0.1