Updating plugins to ST3 branches