Merge Glen's changes onto the base ccy lib