Updates to support master with new currency setting