Please review rt46268. (It's based from v9_11 and has a base tag.)