Adding the missing tag for last merge NO BUG CLOSED TREE DONTBUILD