Update CustisScripts + distribution inheritance fixes