Issue 8428 by tuj: Fixed issue with activation code changing on each commit