Merge "update for change to etsicatalog"