#1256 Salt changes to support auth token and UDT in fallbacks