Did you mean to include these script changes here? You have a separate pull for that.