Merge "Update core plugins to latest revisions"