Merge "Fix approved methods list."