Move the "set SD" code into provided SD and "inherit acls" branches.