Merge "Update plugin references"