Merge "Fix violation of least privilege principle" into pi-dev