Merge "Do not unlink the profiles if not needed" into nyc-dev