Bug 5917 : Catching template changes from bug 5931