Merge "Restrict SipProfiles to profiles directory" into nyc-dev