Merge "Update system server profile" into pi-dev