Yodalee issue32 rebase