Changes in support of AUT-776 (Tag creation improvements)